Commit graph

64 commits

Author SHA1 Message Date
VigersRay
0a91b468b4 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Client/Voting/UI/VotePopup.xaml.cs
#	Content.Client/Voting/VoteManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/BatterySystem.cs
#	Content.Server/Radio/EntitySystems/RadioSystem.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
#	Content.Server/Voting/Managers/VoteManager.cs
#	Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
#	Content.Shared/Voting/MsgVoteData.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/Prototypes/Recipes/Crafting/improvised.yml
2024-09-26 20:17:14 +03:00
lzk
87932bce57
craftable freezers (#32277)
* Craftable freezers

* oh i forgot that
2024-09-24 17:19:40 +02:00
VigersRay
aa38c32b65 upstream 2024-09-16 12:40:23 +03:00
Pieter-Jan Briers
1b1d63f5d6
Vox sign/N2 locker update (#31845)
* Vox sign/N2 locker update

The "vox area" sign and N2 locker sprite were both taken from /vg/station. These sprites have bad racist connotations as discussed in https://github.com/space-wizards/space-station-14/issues/31840, and do not fit our server culture.

The new N2 locker is not a taped on piece of trash. It now also has a blue stripe to mimic the regular O2 locker and make it more distinct from fire safety closets.

The new "vox area" sign sprite follows the same style as other "area indicator" signs used throughout the blue and isn't an explicit warning sign anymore. It still has "No O2" on it to fill that role though.

* emogarbage adjustments

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2024-09-05 23:26:26 -06:00
VigersRay
d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +03:00
Sphiral
1e89c07573
The Shelfs Update (#27858)
* goofed up

* wip, mostly test sprites

* Nearly done, just need to fix storage locks

* everything done to my knowledge

* Alright, construction tested and working, and updated health spread

* remove a single comment I forgot. Pending sprite changes.

* Update sprites and add chemistry locked preset

* Forgot to remove a comment
2024-07-21 11:16:58 -06:00
chavonadelal
d7a37e73ba Locale closet sprites (#2393)
(cherry picked from commit c463d3969b6ed8513de0c8ee6bf6f8d7c89d04ab)
2024-07-11 15:26:29 +03:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2)
* commit
2024-05-31 02:16:18 +03:00
MilenVolf
974129689c
Glass box fixes + Construction & Stealthy deconstruction (#25365)
* Showcase update

* Fix craft prototype. Add glass box deconstruction for stealth gameplay

* Remove duplicated tag

* Forgor

* Some cleanup

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-27 23:53:16 +10:00
Verm
96ad9002f1
You can now see paper on crates (with color!) (#26834)
* Implement changes on not-cooked branch

* Made it work

* Fix update appearance calls

* Fix extra indents, clean-up code, fix tests hopefully

* Fix hammy cagecrate

* Fix messing up the yml, add artifact crate specific labels back in

* Visual Studio hates yml, sad

* Seperate the colors for cargonia

* sorry json

* make label move with artifact door

* Apply suggestion changes

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??)

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-04-14 13:39:02 +10:00
Flareguy
4017f9bd28
Add emergency nitrogen lockers (#26752) 2024-04-10 14:20:05 -07:00
potato1234_x
e94fba5f70
makes closets/lockers better (#24942)
* hmngm

* fix
2024-03-18 21:53:13 +01:00
MilenVolf
c7870882f6
LockVisualizer (#25224)
* LockVisualizer

* Fix state

* Clean some code

* Make it component, fix tests fail

* Fix for StateUnlocked

Now it is possible to manually set the unlocked state and it will work!

* Optimize LockVisualizer, add check for unlocked state

* No todo I guess
2024-02-16 16:52:31 -07:00
KREKS
6850d47ca5
Glassbox shatter resprite (#25136) 2024-02-13 16:43:37 -05:00
Nim
2a9fa67a7f
Glass box for antique laser pistol (#25104)
* glassbox

* fix
2024-02-10 15:36:18 -08:00
Alekshhh
374260c49e
Suit Storage Visual Change (#23799)
* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* dsd

* sdst

* sd
2024-01-14 11:38:36 -05:00
Alekshhh
c138809ba9
Wall Locker Tweaks (#23060)
locker
2023-12-27 20:05:04 -07:00
iacore
a9fa1f4a52
Craftable Steel Closet (#21987)
Make closet craftable
2023-12-18 14:46:16 -05:00
Ubaser
923bbfbac8
Janitorial Bomb Suit (#22244)
* add

* add cargo purchase

* fix

* it works

* do not map
2023-12-11 01:41:54 -07:00
Tunguso4ka
aeceea0ff3
space cleaner and fuel dispensers (#21610)
* cleaner and oil wall dispensers

* fuel

* meta jason

* yaml

* fixed error

* suggest

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* fuck webedit

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2023-11-13 16:00:51 -07:00
Tunguso4ka
c90316dfbd
Lockers for clown, mime and NT Representative (#21504)
* clown, mime, blue shield and NT representative now have own lockers. Will it be merged? You`l see it in the next 3-4 days. Stay tuned in.

* blue... shield? never heard of him before.
2023-11-07 18:38:18 -05:00
rosieposie
cb1b067a21
Lockable Suit Storages (#20950) 2023-10-17 18:33:02 -07:00
drteaspoon420
574b2a94d9
Added generic empty liquids tank (#20563) 2023-09-30 13:21:07 -07:00
Kara
7c8eb6692a
Ore boxes (#19838) 2023-09-16 21:49:54 +10:00
PixelTK
74bd86af2f
Arachnid RE-REWORK (#19138)
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
2023-09-04 13:02:54 -07:00
Emisse
3268ea3d92
plastic hydro crates (#19112) 2023-08-14 02:29:01 -05:00
Emisse
b3c8dff61c
o2 crate recolour (#19113)
* o2 crate recolour

* fix inside of box shading
2023-08-14 02:28:53 -05:00
Emisse
603f990f8a
engi crate recolor (#19094) 2023-08-14 00:17:07 -04:00
potato1234_x
f4bbe3603d
Add trash carts and janitorial trash carts (#18996)
* everything

* half loot
2023-08-12 13:05:32 -06:00
potato1234_x
fbecde1f68
ice (#18985) 2023-08-11 01:28:26 -06:00
Nemanja
9eee1adcb9
The Cratening (#18972)
* so it begins

* The Cratening

* welded sprites
2023-08-10 19:12:38 -05:00
Hyenh
ede3e89851
Adds Syndicate Crate (#18497)
* Retextures surplus crates.

* Adds locale name+desc.

* Removes period from ent names.
2023-07-31 14:28:15 -06:00
AjexRose
7ef7fb2096
Retexture of command crate (#18294) 2023-07-25 14:18:01 -06:00
Tunguso4ka
730285290a
coffin and two graves (#18213) 2023-07-23 21:13:10 -06:00
brainfood1183
c99585c94f
Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
MisterMecky
8e3f2cc1fa
fix watercooler sprite (Also adds solution visuals) (#16740) 2023-05-24 01:24:42 +10:00
MisterMecky
0e337fb646
add solution visuals for watertank, fueltank etc. (#16653) 2023-05-21 18:27:51 -06:00
Fluffiest Floofers
58998df37d
Updates the suit storage to tg 3/4 version (#16566) 2023-05-18 13:52:05 -04:00
Flareguy
19b5d9253d
Suit storage units (#16128) 2023-05-13 21:36:46 -04:00
Maxtone
332510df3b
Paramedic role, redone (#15439)
Co-authored-by: MagnusCrowe <whiterider1988@yahoo.com>
2023-05-01 17:13:56 +10:00
Puro
0ec5e257ad
[Fix] Small mistakes (#15955) 2023-04-30 19:04:49 -06:00
metalgearsloth
0c16e5f076
Remove kvass (#15939)
- Sprite looks bad.
- I don't think I've ever seen it ordered.
- There's no reason to have one drink in a tank.
- Adding region-specific things is cringe.
2023-04-30 02:16:15 -05:00
Puro
509761c260
[Brigmedic] Something like a "big update" (#15496)
* [Brigmedic] Something like a "big update"

* new locker

* hardsuit resprite

* resprite resprited hardsuit

back to the future

* custom headset

* remove key

* TrackingImplanter in locker

* pda UI fix

* brigmedic bedsheet

* added transparency

* mask

* desc

* name mask

* skirt of life

* Suits resprite

* PDA resprite | Brigmed - Brigmedic

* meta dic :)

* Beret + medical gown

* backpacks

* locker fill update

* why not?

bzzz Moth-pocalypse

* Brigmed - Brigmedic

* fix

* chance update
2023-04-26 00:48:44 -06:00
Chris
e6012a3956
Add secure chemistry crates and jugs (#15211) 2023-04-24 09:53:17 +10:00
potato1234_x
41f8b401da
Misc sprite changes (#15011) 2023-04-14 12:43:49 -07:00
brainfood1183
8e817e2b97
pirate content (#11799)
* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-04-09 22:47:40 -07:00
potato1234_x
a42a2f8021
High-capacity welding fuel tank (#15019)
* high capacity fuel tank

* nerf that explosion holy shit

* e
2023-04-03 00:26:57 -06:00
potato1234_x
33f937cdc4
Frezon Canister Tweaks (#14442) 2023-03-13 23:42:07 -04:00
metalgearsloth
b1b3f765fa
Fix the remaining invalid RSIs (#13113) 2022-12-20 11:49:18 -06:00
metalgearsloth
798a880a82
Fix some more rsis (#13107) 2022-12-20 09:37:34 +01:00