0300927974
Merge pull request #9487 from Citadel-Station-13/spooky
...
adds an easy way for admins to force enable halloween races without the rest of halloween's code
2019-11-20 23:00:09 -06:00
28190bc168
Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109
...
emagged medibots now murder the everloving fuck out of slimepeople
2019-11-20 22:52:11 -06:00
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
47888bd208
Merge pull request #9877 from Ghommie/Ghommie-cit381
...
Unmodularize pAI holo-chassis icons.
2019-11-20 21:47:00 -07:00
c40cad1658
Starting an explosion rework, fun fun
2019-11-20 19:01:59 -08:00
bfb5f75016
Finishing up final UI adjustments
2019-11-20 21:23:54 +00:00
920eba0b03
ayy
2019-11-20 21:41:59 +01:00
aab7ad192b
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-20 21:00:17 +01:00
75ac087988
Unmodularize pAI holo-chassis icons.
2019-11-20 05:54:00 +01:00
67abc4ff03
Merge pull request #9855 from Ghommie/Ghommie-cit371
...
Fixing suit store overlays
2019-11-19 21:38:22 -07:00
c1a416e257
Merge pull request #9858 from Ghommie/Ghommie-cit372
...
Fixing gasping xenos.
2019-11-19 21:37:17 -07:00
4d1a9a0773
Merge pull request #9816 from Ghommie/Ghommie-cit356
...
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-19 21:30:13 -07:00
a2f85cd19d
Merge pull request #9819 from Ghommie/Ghommie-cit358
...
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
2019-11-19 21:29:30 -07:00
f883f55391
Merge pull request #9818 from GrayRachnid/portssaboteur
...
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
2019-11-19 21:28:25 -07:00
b78da82336
Honkbot slip and slide fun ride.
2019-11-20 04:03:57 +01:00
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
1b1ed21f42
No adrenals for borgs please
2019-11-19 22:13:22 +13:00
40a01dedfe
Merge pull request #9806 from BlackMajor/Yote
...
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
6cdb54bef1
Fix service borg lights breaking
2019-11-19 21:29:05 +13:00
31c59b7cad
fixes upgrades removing dogborg stuff
2019-11-19 20:50:59 +13:00
63a3919ed2
Fixing gasping xenos.
2019-11-18 20:58:22 +01:00
d5e7f77c13
A
2019-11-18 18:47:34 +01:00
bddb437872
It works now.
2019-11-18 18:30:46 +01:00
21c1f8bc2a
Fixing suit store overlays
2019-11-18 15:19:39 +01:00
6e9d2d57c0
check_shields from human to living, part 2
2019-11-17 22:06:19 +01:00
b560ff8284
refactoring code to allow all living mobs to use shields.
2019-11-17 06:23:12 +01:00
4d71f95b16
Merge branch 'master' into HeadCorgi
2019-11-17 12:24:04 +11:00
8a54a73be4
e
2019-11-17 12:12:46 +11:00
aed866339f
pickup pickup pickup pickup 100% pickup
2019-11-17 12:00:17 +11:00
21775ad3ee
Merge pull request #9813 from Ghommie/Ghommie-cit355
...
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-16 01:24:58 -07:00
66f8b5f404
Merge pull request #9769 from Ghommie/Ghommie-cit336
...
ID console fixes and other tweaks.
2019-11-16 01:17:23 -07:00
7a1f3dcdba
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
2019-11-15 23:14:28 +01:00
3edaf75722
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
2019-11-15 16:58:45 -05:00
2b104a7698
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-15 18:40:45 +01:00
f3c4897b48
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
2019-11-14 22:31:48 -08:00
57bd0f5fb8
Revert "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS"
...
This reverts commit bc6c617c27
2019-11-15 16:42:34 +11:00
bc6c617c27
DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS
2019-11-15 16:42:26 +11:00
c7a3652d0a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
2019-11-15 01:12:36 +01:00
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
f401e622c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-15 01:01:08 +01:00
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
178501f415
Merge pull request #9785 from Ghommie/Ghommie-cit344
...
tweaked towel sprites tonalities and fixing their onmob suit overlay.
2019-11-14 16:22:28 -07:00
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
2f4562a63b
Merge pull request #9656 from Ghommie/Ghommie-cit290
...
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
318c03cc28
Merge pull request #9683 from Ghommie/Ghommie-cit303
...
Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
8f08e1017e
Merge pull request #9688 from Ghommie/Ghommie-cit306
...
Fixing gibspawner runtimes and improving them, how gruesome...
2019-11-14 15:51:20 -07:00
af0962088c
Merge pull request #9453 from Ghommie/Ghommie-cit226
...
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
2019-11-14 15:47:18 -07:00
98bc6d6c60
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-14 23:33:37 +01:00
baedb7e091
I'm unprofessional.
2019-11-14 15:16:06 +01:00
nik707