Commit Graph

55 Commits

Author SHA1 Message Date
Ed
684ec72541 Upstrearm sync (#94)
* Fix for the salvage ice labs map. (#26928)

* done

* more work

* Automatic changelog update

* Update Credits (#26938)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* Fix cryostorage identifying unknown characters as captain (#26927)

Fixed cryostorage getting captain's record for unknown jobs.
Also localized Unknown job string.

* Automatic changelog update

* Fixed Honkbot/jonkbot honking like crazy, gave honkbot/jonkbot standard idle ai. (#26939)

* Fixed Honkbot/jonkbot honking like crazy, gave honkbot/jonkbot standard idle ai.

* Update Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Automatic changelog update

* Bug fix: Force cancellation of RCD constructions if the construction type is changed (#26935)

Force cancellation of RCD constructions if the construction type is changed

* Fix standart -> standard and dressfilled test fail (#26942)

Fix standart -> standard

* Add Ability to stop sound when MobState is Dead (#26905)

* Add stopsWhenEntityDead to sound components

* Convert component

* Review

* Fix dupe sub

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Fix rockets and lasers looking like they have nothing loaded (#26933)

* Automatic changelog update

* 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>

* Make UtensilSystem and SharpSystem not run AfterInteract if it has already been handled (#25826)

* Make UtensilSystem and SharpSystem not run AfterInteract if it has already been handled

* merge conflicts

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Add two-message overload to PopupPredicted (#26907)

Added two-message overload to PopupPredicted

* Update submodule to 218.0.0 (#26945)

* Autism pins! (#25597)

* hee hee he ha ha

* added gold varients, forgive me for my spritework

* maints loot, copying from past PRs

* Trying to fix RSI

* speedran these sprites in break time, pictures will be later

* Fixed/Tweaked glows

* consensus

* gregregation

* dam copiryte

* oops i forgot to delete 2 fields hope this works

* Automatic changelog update

* Fix database round start date issues (#26838)

How can ONE DATABASE COLUMN have so many cursed issues I don't know, but it certainly pissed off the devil in its previous life.

The start_date column on round entities in the database was added by https://github.com/space-wizards/space-station-14/pull/21153. For some reason, this PR gave the column a nonsensical default value instead of making it nullable. This default value causes the code from #25280 to break. It actually trips an assert though that's not what the original issue report ran into.

This didn't get noticed on wizden servers because we at some point backfilled the start_date column based on the stored admin logs.

So I change the database model to make this column nullable, updated the C# code to match, and made the existing migration set the invalid values to be NULL instead. Cool.

Wait how's SQLite handle in this scenario anyways? Well actually turns out the column was *completely broken* in the first place!

The code for inserting into the round table was copy pasted between SQLite and PostgreSQL, with the only difference being that the SQLite key manually assigned the primary key instead of letting SQLite AUTOINCREMENT it. And then the code to give a start_date value was only added to the PostgreSQL version (which is actually in the base class already). So for SQLite that column's been filled up with the same invalid default the whole time.

Why was the code manually assigning a PK? I checked the SQLite docs for AUTOINCREMENT[1], and the behavior seems appropriate.

I removed the SQLite-specific code path and it just seems to work regardless. The migration just sets the old values to NULL too.

BUT WAIT, THERE'S MORE!

Turns out just doing the migration on SQLite is a pain in the ass! EF Core has to create a new table to apply the nullability change, because SQLite doesn't support proper ALTER COLUMN. This causes the generated SQL commands to be weird and the UPDATE for the migration goes BEFORE the nullability change... I ended up having to make TWO migrations for SQLite. Yay.

Fixes #26800

[1]: https://www.sqlite.org/autoinc.html

* Fix options menu crashing in replays (#26911)

Not having the nullable set properly is annoying but fixing that would probably be a significant amount of work.

* Greyscale color clothing (#26943)

* greyscales color gloves, color jumpsuits, and shoes

* remove popbob

* fix test fails

* Automatic changelog update

* WT550 Buffs + Burst Mode for WT550 & C-20R (#26886)

* Slightly increased WT550 Firerate, drastically reduced recoil, and given it the option to fire in 5 round bursts.

* Given the C-20 a 5 round burst aswell

* Automatic changelog update

* make holoparasites actually holographic (#26862)

it's over

* Automatic changelog update

* Add character sheets to board game crate (#26926)

add character sheets to board game crate

* Automatic changelog update

* Game server admin API (#26880)

* Reapply "Game server api" (#26871)

This reverts commit 3aee197923.

* Rewrite 75% of the code it's good now

* Wield recoil components (#26915)

* WieldRecoilComponents

* WieldRecoilComponents

* Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs

Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>

* Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs

---------

Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Clown shoes make you waddle, as God intended (#26338)

* Clown shoes make you waddle, as God intended

* OOPS

* Toned down, client system name fix

* Tidy namespacing for @deltanedas

* Refactor to handle prediction better, etc.

* Resolve PR comments.

* Automatic changelog update

* Use round time instead of server time for criminal history (#26949)

make criminal records computer use round time for history instead of the server time

* Rotate and Offset station CCVar nuke (#26175)

* no content

* add noRot to Europa

* bruh. and this

* yay

* fix

* Update debug.yml

---------

Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: superjj18 <gagnonjake@gmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Terraspark4941 <terraspark4941@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com>
Co-authored-by: Froffy025 <78222136+Froffy025@users.noreply.github.com>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: ilya.mikheev.coder <imc-ext+github@ilyamikcoder.com>
2024-04-14 20:34:16 +03: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
brainfood1183
375ca1e22b Hamster Pet (GhostRoleMob) (#12813) 2022-12-06 15:28:05 -08:00
Morb
cc3f9d631f Remove yml boilerplate for crates (#11982) 2022-10-22 15:37:27 -07:00
Nemanja
4fe4ba1575 wall mounted lockers (#11382) 2022-09-17 13:05:39 -07:00
Justin Trotter
6bf45709e9 Add access locks to gas canisters (#10575) 2022-09-16 07:06:29 -07:00
Martin Petkovski
12ab9e838e Add wall mounted lockers (#10673) 2022-08-24 17:08:57 +10:00
Kara
7a553781cc Frezon (#9980)
* stuff i'll have to fix anyway when n2o gets merged

* everything except the finished reactions

* freon coolant reaction but with bad curve

* miasmic subsumation

* freon production

* nitrogen and diff temp scaling

* uhh meant to change that

* #

* hitting that frezon boof
2022-07-27 04:55:28 -05:00
Rane
1c8bdaf7c4 Sleeping (#9793) 2022-07-26 21:46:24 -07:00
KIBORG04
71c8d08e4c Kvass (#9082)
* add kvass

* nevermind

* forgot about double 's'

* Update tanks.yml

* gotovo

* Update meta.json
2022-07-11 23:11:12 -07:00
EmoGarbage404
8b8ad9a513 Filing Cabinet Resprites (#8043) 2022-05-09 17:46:23 -07:00