Commit Graph

19834 Commits

Author SHA1 Message Date
Arturlang 7d3103a260 Done 2019-12-04 15:02:36 +02:00
Ghommie 3d7ef827a9 better. 2019-12-04 06:31:48 +01:00
Ghommie dc91114e8b fixes sofa overlays doing jackshit, because their layer wasn't properly set. 2019-12-04 06:26:11 +01:00
TrilbySpaceClone e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
kappa-sama 525d36cc6b chaos 2019-12-03 23:18:45 -05:00
kappa-sama af0cbc460b charger 2019-12-03 23:18:03 -05:00
kevinz000 d578bbd10a Merge pull request #10021 from Putnam3145/rld-fix
Makes glowsticks no longer radioactively contaminable.
2019-12-03 19:53:18 -07:00
kevinz000 6e7bceb993 Merge pull request #10039 from Putnam3145/traitor-fix
makes traitor antag datum and descendents removable by admins
2019-12-03 19:15:19 -07:00
Putnam 4e2c72f2ed makes traitor removable 2019-12-03 16:58:32 -08:00
Trilbyspaceclone aa3598f166 less dope 2019-12-03 19:51:19 -05:00
Trilbyspaceclone 0b90def435 Update sheet_types.dm 2019-12-03 19:43:31 -05:00
Ghommie 91ffa11bc9 Nerfs circuit pneumatic cannons and guns with extra sanity checks. 2019-12-04 01:07:36 +01:00
Ghommie 71a5d12c44 Don't run away Assembly!! I'll end you!! 2019-12-03 23:08:11 +01:00
Ghommie 3fb485c721 Fixes the incongruent bone satchel description. 2019-12-03 22:39:07 +01:00
Artur af4eaf7f0f Fixeesss 2019-12-03 23:09:11 +02:00
Seris02 72e5e17c51 ratvarian and narsian winter coats 2019-12-03 18:16:36 +08:00
Ghommie 428234c0d6 Dilemma. 2019-12-03 06:53:46 +01:00
Ghommie fa270c8a79 leftovers. 2019-12-03 06:48:25 +01:00
Ghommie 6e318bfb09 Fixes traitor codewords highlight and some other hear signal hoonks. 2019-12-03 06:31:35 +01:00
Ghommie fdea134d64 dum 2019-12-03 04:30:46 +01:00
Ghommie 3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Lin 100e1e0507 why didn't I do this earlier 2019-12-03 01:40:37 +00:00
Lin b501321362 Merge pull request #9941 from Putnam3145/personal-closet-fix
Personal closets can use PDAs/tablets now
2019-12-03 01:38:42 +00:00
Lin a33dba803e Merge pull request #9992 from Ghommie/Ghommie-cit411
Fixes ai displays status being reset to "Neutral" on login, regardless of choice.
2019-12-03 01:36:02 +00:00
Ghommie 9b62a5ad01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:33:32 +01:00
Ghommie 8615c0ea8f Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:32:59 +01:00
Lin 00acb5749f Merge pull request #9988 from Ghommie/Ghommie-cit409
Fixes ED-209 being unbuildable past the welding step.
2019-12-03 01:31:40 +00:00
Lin 99e9c7299e Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
2019-12-03 01:30:51 +00:00
Winter Flare c31ca96e87 Rebalanced Meat Crate 2019-12-02 16:21:48 -05:00
Ghommie 5669c77d48 Bad 2019-12-02 19:21:01 +01:00
Ghommie 30b67afed9 holodeck machineries and structures have nodeconstruct_1, which means they won't call on_deconstruct anyway. 2019-12-02 19:18:36 +01:00
Ghommie cd3952cb9e Fixes holodeck sleepers leaving sleeper buffers behind when deleted. 2019-12-02 19:08:21 +01:00
Artur 90113838a7 Iconfix and co
Traits instead of procs for fakedeath

Quickfix

Whoops this too

Loadsa fixes

Nerfs stamina regen

Too slow

Hm
2019-12-02 19:48:02 +02:00
Putnam3145 8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145 8da17c5aaf Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
2019-12-01 23:12:35 -08:00
Putnam3145 af31fe12c7 Merge pull request #9976 from Ghommie/Ghommie-cit405
Ports "Fixes transit tube barricade spam"
2019-12-01 23:07:53 -08:00
Putnam3145 7bb2b042ee Merge pull request #9989 from Ghommie/Ghommie-cit410
Ports the energy gun empty state overlay fix.
2019-12-01 23:06:40 -08:00
Trilbyspaceclone 82ab55453b Apply suggestions from code review
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-12-01 20:57:13 -05:00
Linzolle f4318c9dba bleeding indicator for more than jsut heparin 2019-12-01 18:10:48 -06:00
Linzolle 04e9466465 and we don't have this span... 2019-12-01 16:06:13 -06:00
Linzolle 560ad9cce2 tfw we don't have these defines 2019-12-01 16:03:36 -06:00
Linzolle ce04739ccb neck slice 2019-12-01 15:53:40 -06:00
Putnam3145 4942002698 Merge pull request #10022 from Sishen1542/n
techfabs are now easier to investigate
2019-12-01 13:44:00 -08:00
Putnam3145 c5c52caf2e Merge pull request #10010 from Ghommie/Ghommie-cit415
Fixes implant pads and updates them a little (WHY THE HELL DO WE STILL HAVE THIS OLDCODE CRAP LINGERING AROUND?)
2019-12-01 13:43:21 -08:00
Linzolle efbc85cb40 couple fxies 2019-12-01 15:39:55 -06:00
Linzolle a20b975d68 copy paste errors lol 2019-12-01 14:40:25 -06:00
Linzolle 19b004edab update butchering 2019-12-01 14:35:11 -06:00
Seris02 cebf2d2de2 does putnam's suggestion
I edited this on a web browser so if it breaks blame putnam
2019-12-02 00:30:20 +08:00
Sishen 3ccc88e2b9 Update meteor_wave.dm 2019-12-01 05:15:41 -07:00
Sishen a4323b2e4e Update _production.dm 2019-12-01 05:10:30 -07:00