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
Useroth
2e84c30e59
Tiny touch-ups
2019-12-05 16:29:50 +01:00
Useroth
950b884da5
Adds colored fairygrass.
2019-12-05 01:47:42 +01: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
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
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
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
Ghommie
e6484a22a8
Ports tgstation loom changes, and durathred golems.
2019-11-29 05:34:17 +01:00
Lin
46c02af86e
Merge pull request #9948 from Ghommie/Ghommie-cit393
...
Morgues no longer go "ammunition depleted"
2019-11-28 19:12:25 +00:00
Putnam3145
09897b4ece
Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
...
Ports AI console focus loss fix and fixes an error in my trimline code
2019-11-28 05:37:36 -08:00
Ghommie
60b8688674
Ports "Fixes transit tube barricade spam"
2019-11-28 07:10:00 +01:00
Ghommie
0ad89bd9de
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-11-28 05:34:56 +01:00
Ghommie
efcf79aab0
teachin' 🅱️ how to swim
2019-11-28 02:32:43 +01:00
Ghommie
13b9158a44
Ports "Plasmamen get plasma in their box"
2019-11-28 02:30:03 +01:00
kevinz000
2aa0211121
Merge pull request #9906 from Xantholne/xantholne-berets02
...
[Ready] Ports/Adds new berets but I don't break the branch somehow
2019-11-26 19:26:18 -07:00
Fermi
e6ecabe54c
Scanner
2019-11-26 23:23:29 +00:00
Fermi
ca2467ff93
Thingie
2019-11-26 23:14:14 +00:00
kevinz000
ccfdb74508
Merge pull request #9882 from FestiveBall/Fersi
...
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
Ghommie
d6d830b2ec
Morgues no longer go "ammunition depleted"
2019-11-26 22:20:52 +01:00
Putnam
66d1b88725
Get
2019-11-25 22:23:50 -08:00
Putnam
1283149fb2
also allowed wallets
2019-11-25 22:22:16 -08:00
Fermi
c5e6cb8ac0
space
2019-11-26 04:08:10 +00:00
Fermi
69e0f6836a
Adds a lil message so people don't spend 25 minutes trying everything
2019-11-26 04:05:43 +00:00
Unknown
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
Dap
281ddf73ba
Ports AI console focus loss fix and fixes an error in my trimline code
...
Port of https://github.com/tgstation/tgstation/pull/44207 and I copy pasted code and missed renaming one thing.
2019-11-25 14:48:26 -07:00
Putnam
639c07665d
Personal closets can use PDAs/tablets now
2019-11-25 02:00:03 -08:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
