Ghommie
|
b75349bebf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 04:32:09 +01:00 |
|
Putnam3145
|
0adcb900c1
|
Merge pull request #10155 from Seris02/windowfix
adds some distance checks to some things
|
2019-12-17 11:34:13 -08:00 |
|
Putnam3145
|
670141edf7
|
Merge pull request #10209 from Ghommie/Ghommie-cit470
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-17 11:26:36 -08:00 |
|
Ghommie
|
93fbc17428
|
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-16 17:58:50 +01:00 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
Artur
|
9faf3d1dac
|
Mooaar fixeees
|
2019-12-14 01:01:38 +02:00 |
|
Ghommie
|
3fcb7808fd
|
args
|
2019-12-13 02:30:17 +01:00 |
|
Seris02
|
f565c1cd3c
|
adds some distance checks
|
2019-12-12 18:48:25 +08:00 |
|
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 |
|
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
|
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 |
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
Ghommie
|
95cc84e69e
|
Fixes a few holo barriers' transparency.
|
2019-12-07 12:13:33 +01: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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Putnam3145
|
af31fe12c7
|
Merge pull request #9976 from Ghommie/Ghommie-cit405
Ports "Fixes transit tube barricade spam"
|
2019-12-01 23:07:53 -08:00 |
|
Artur
|
f48d8016d5
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-01 13:51:57 +02:00 |
|
Artur
|
02048ce009
|
Bludsuckers
|
2019-11-29 21:28:14 +02: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 |
|
Ghommie
|
3b8aebbbc2
|
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-11-29 00:40:16 +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 |
|
Ghommie
|
60b8688674
|
Ports "Fixes transit tube barricade spam"
|
2019-11-28 07:10:00 +01: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 |
|
Unknown
|
4e20f576e6
|
Merge branch 'master' into xantholne-berets02
|
2019-11-25 20:16:15 -07:00 |
|
Putnam
|
639c07665d
|
Personal closets can use PDAs/tablets now
|
2019-11-25 02:00:03 -08:00 |
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13:00 |
|
Lin
|
028fa518e4
|
Merge pull request #9879 from Ghommie/Ghommie-cit383
Unmodularize closets.
|
2019-11-23 05:39:33 +00:00 |
|
TrilbySpaceClone
|
b01be3b1ff
|
Merge branch 'master' into crow
|
2019-11-22 05:48:36 -05:00 |
|
TrilbySpaceClone
|
2136968585
|
Ring ring
|
2019-11-21 21:55:17 -05:00 |
|
Lin
|
1ddb9935ff
|
Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
|
2019-11-22 02:37:49 +00:00 |
|
Lin
|
3979079fde
|
Merge pull request #9518 from Ghommie/Ghommie-cit243
Ports "You can now click on objects and mobs below flaps and signs"
|
2019-11-22 01:36:47 +00:00 |
|
Unknown
|
4974400ccb
|
Merge branch 'master' into xantholne-berets01
|
2019-11-21 11:01:42 -07:00 |
|