f0996208a3
Merge pull request #9874 from Ghommie/Ghommie-cit379
...
Honkbot slip and slide fun ride.
2019-11-23 11:49:32 -07:00
f88ed98ee4
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
...
Anthromorphic Insect Revert
2019-11-23 11:44:52 -07:00
e954cec58c
Merge pull request #9898 from Ghommie/Ghommie-cit387
...
Dreamchecker compatibility changes, part 3.
2019-11-23 05:52:44 +00:00
1c8b557466
fixes AI.dm again
2019-11-23 04:13:30 +00:00
6426e5dade
makes the icons not break
2019-11-23 03:54:39 +00:00
a6ff44782a
adds more unique ai holograms
2019-11-23 03:51:04 +00:00
b404e18b15
Merge branch 'master' into FERMICHEMCurTweaks
2019-11-23 00:10:33 +00:00
77913406ed
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 18:50:24 -05:00
b7f7342e43
Merge pull request #9900 from Ghommie/Ghommie-cit388
...
fixing a get_idcard runtime. or The betrayal of the ?. operator
2019-11-22 15:41:52 -08:00
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
7d3599b2f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
2019-11-22 18:53:58 +01:00
216790d442
Merge branch 'master' into HeadCorgi
2019-11-22 21:54:05 +11:00
98998ca85f
un-moths the anthromorphic insects
2019-11-21 19:47:48 -08:00
522a664f55
Merge pull request #9887 from Ghommie/Ghommie-cit385
...
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
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
bfeece4c6e
fixing a get_idcard runtime. The betrayal of the ?.
2019-11-21 09:23:05 +01:00
6a0bd7c925
THE REVENGE OF THE WHITESPACES
2019-11-21 07:40:49 +01:00
911a33bfd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387
2019-11-21 06:36:59 +01:00
dccb3c2e22
part 3
2019-11-21 06:36:22 +01:00
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
21c1f8bc2a
Fixing suit store overlays
2019-11-18 15:19:39 +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
kevinz000