Lin
|
a91139c470
|
Merge pull request #10068 from Ghommie/Ghommie-cit433
Ports "Makes the windup toolbox more similar to His Grace".
|
2019-12-07 21:52:10 +00:00 |
|
Ghommie
|
99f694c94a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit433
|
2019-12-06 15:31:40 +01:00 |
|
Ghommie
|
622b3e5608
|
ddddddd
|
2019-12-06 15:31:05 +01:00 |
|
Winter Flare
|
8bd6c58bcd
|
Merge branch 'master' into cargocleanupv2boogaloo
|
2019-12-06 01:27:44 -05:00 |
|
Winter Flare
|
b860c6e0bb
|
Merge branch 'master' into cargocleanupv2boogaloo
|
2019-12-06 01:14:44 -05:00 |
|
Putnam3145
|
4e022af46f
|
Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
|
2019-12-05 21:16:47 -08:00 |
|
kevinz000
|
8cb6ff10b8
|
Merge pull request #10034 from Ghommie/Ghommie-cit420
Fixes the incongruent bone satchel description.
|
2019-12-05 22:00:38 -07:00 |
|
kevinz000
|
e16b61b865
|
Merge pull request #10043 from Arturlang/patch-1
PDA cartridges and their contents can no longer be contaminated
|
2019-12-05 21:58:33 -07:00 |
|
kevinz000
|
b8bb0f2924
|
Merge pull request #10048 from Ghommie/Ghommie-cit426
Demodularize moodlets.
|
2019-12-05 21:56:29 -07:00 |
|
Putnam3145
|
6b2d3b116d
|
Merge branch 'master' into Ghommie-cit430
|
2019-12-05 20:53:14 -08:00 |
|
kevinz000
|
a65588009c
|
Merge pull request #10038 from Trilbyspaceclone/patch-240
Makes trash carts craftable with plastic
|
2019-12-05 21:51:30 -07:00 |
|
kevinz000
|
13f43eb783
|
Merge pull request #10045 from Trilbyspaceclone/patch-241
Makes wallets hold more stuff
|
2019-12-05 21:49:50 -07:00 |
|
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
|
29497320c1
|
Merge pull request #10025 from Linzolle/butchering
refactor butchering component
|
2019-12-05 21:19:57 -07: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 |
|
Useroth
|
950b884da5
|
Adds colored fairygrass.
|
2019-12-05 01:47:42 +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 |
|
Arturlang
|
7d3103a260
|
Done
|
2019-12-04 15:02:36 +02: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
|
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
|
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 |
|
Ghommie
|
e6484a22a8
|
Ports tgstation loom changes, and durathred golems.
|
2019-11-29 05:34:17 +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 |
|
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 |
|
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 |
|
Winter Flare
|
6a4c959b0a
|
Added more crates.
|
2019-11-24 19:05:03 -05:00 |
|