Commit Graph

4364 Commits

Author SHA1 Message Date
kevinz000 b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-12-05 21:47:29 -07:00
kevinz000 5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
kevinz000 e2f9a68c2c Merge pull request #10049 from Useroth/new-tg-plants
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
kevinz000 d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
2019-12-05 21:33:12 -07:00
kevinz000 70d305611c Merge pull request #10042 from Ghommie/Ghommie-cit422
fixes sofa overlays doing nothing, because their layer wasn't properly set.
2019-12-05 21:28:24 -07:00
kevinz000 29497320c1 Merge pull request #10025 from Linzolle/butchering
refactor butchering component
2019-12-05 21:19:57 -07:00
Ghommie d3d1116094 null = n_color, no. 2019-12-06 03:59:51 +01:00
Ghommie 2528714035 I have no liability about glowing robotic eyes not automatically updating right here. 2019-12-06 03:56:48 +01:00
Ghommie 9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Useroth 2e84c30e59 Tiny touch-ups 2019-12-05 16:29:50 +01:00
Artur 82d1497ddc Fixes bad buds and toxin healing 2019-12-05 17:29:00 +02:00
Ghommie 33fee5bd37 Witty remark included. 2019-12-05 02:12:34 +01:00
Ghommie a7d2fac0e9 "Why does it tell me it's "out of range", but not to you, X-ray man?" 2019-12-05 01:55:21 +01:00
Useroth 950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00
Ghommie 7fa2232fc7 Adds view and viewers checks for ranged construction devices such as ARCD and RLD. 2019-12-05 01:28:44 +01:00
Ghommie 77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
Arturlang 138847838a I suppose 2019-12-04 21:17:49 +02:00
Trilbyspaceclone 2a591df09a Update wallets.dm 2019-12-04 12:50:18 -05:00
Ghommie 3f0d1e275e Made wooden cabinet/closets... actually made of wood. 2019-12-04 18:27:17 +01:00
Trilbyspaceclone 8ecb920c7f Update bins.dm 2019-12-04 12:20:24 -05:00
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
kevinz000 d578bbd10a Merge pull request #10021 from Putnam3145/rld-fix
Makes glowsticks no longer radioactively contaminable.
2019-12-03 19:53:18 -07: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 3fb485c721 Fixes the incongruent bone satchel description. 2019-12-03 22:39:07 +01:00
Ghommie 3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01: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 99e9c7299e Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
2019-12-03 01:30:51 +00:00
Putnam3145 8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -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 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 19b004edab update butchering 2019-12-01 14:35:11 -06:00
Artur f48d8016d5 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-01 13:51:57 +02:00
Putnam 010bee19f4 damn you feasel 2019-12-01 00:22:15 -08:00
Putnam3145 1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
2019-11-30 22:51:42 -08:00
Putnam3145 44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
deathride58 b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00
loginsandylogout c0e77f8fdf Update code/game/objects/items/stacks/medical.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-29 15:10:30 -06:00
Commandersand 36b0ef53a0 bruh 2019-11-29 14:49:29 -06:00
Commandersand 4c4935f155 yeet 2019-11-29 14:13:39 -06:00
Artur 02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Ghommie d9636398e1 Fixes implant pads 2019-11-29 20:12:10 +01:00
Ghommie f5b4d6a0ad Oh bummers. 2019-11-29 07:27:05 +01:00
Ghommie 9b8ed8ca4f The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs. 2019-11-29 07:14:51 +01:00
kevinz000 bd43a08347 Merge pull request #9967 from Ghommie/Ghommie-cit401
Ports "Plasmamen get plasma in their box"
2019-11-28 23:11:05 -07:00
Ghommie 0bfa2e1438 -hit 2019-11-29 05:36:55 +01:00
Ghommie 77201406bc Oh sh- 2019-11-29 05:35:53 +01:00