Lin
|
9ec8458803
|
Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-12-10 23:52:31 +00:00 |
|
BlackMajor
|
8817f04e19
|
Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
|
2019-12-10 11:18:55 +13:00 |
|
Lin
|
7794cea49c
|
Merge pull request #9538 from Citadel-Station-13/kevinz000-patch-99
Brings the combat back in combat defibrillator (DOES NOT BUFF CMO DO NOT YELL AT ME)
|
2019-12-09 04:33:23 +00:00 |
|
kevinz000
|
9869c1c440
|
Merge pull request #10099 from Ghommie/Ghommie-cit446
Fixes a few holo barriers lacking transparency.
|
2019-12-08 19:05:10 -07:00 |
|
Ghommie
|
414d4b7a90
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
|
2019-12-09 00:04:22 +01:00 |
|
Lin
|
6368f04f2d
|
Merge pull request #10044 from Ghommie/Ghommie-cit423
Made wooden cabinet/closets... actually made of wood.
|
2019-12-08 22:18:15 +00:00 |
|
Lin
|
ef01bbd222
|
Merge pull request #10075 from Ghommie/Ghommie-cit436
Demodularize defib disks and projectiles icons.
|
2019-12-08 20:15:01 +00:00 |
|
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 |
|
Lin
|
24e4673c2b
|
Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
|
2019-12-07 21:49:18 +00:00 |
|
Ghommie
|
95cc84e69e
|
Fixes a few holo barriers' transparency.
|
2019-12-07 12:13:33 +01:00 |
|
Ghommie
|
7cc332960b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-12-07 05:30:07 +01:00 |
|
Ghommie
|
723690bab0
|
Demodularize defib disks and projectiles icons.
|
2019-12-06 23:07:50 +01: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
|
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 |
|
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 |
|
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 |
|