Fermi
614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
and Fermi
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
and Fermi
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
and Fermi
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
and Fermi
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
and Fermi
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
and Fermi
b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
and Fermi
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
kevinz000 and GitHub
47888bd208
Merge pull request #9877 from Ghommie/Ghommie-cit381
...
Unmodularize pAI holo-chassis icons.
2019-11-20 21:47:00 -07:00
Ghommie
75ac087988
Unmodularize pAI holo-chassis icons.
2019-11-20 05:54:00 +01:00
kevinz000 and GitHub
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
kevinz000 and GitHub
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
BlackMajor
6cdb54bef1
Fix service borg lights breaking
2019-11-19 21:29:05 +13:00
BlackMajor
31c59b7cad
fixes upgrades removing dogborg stuff
2019-11-19 20:50:59 +13:00
kevinz000 and GitHub
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
GrayRachnid
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
kevinz000 and GitHub
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
Ghommie
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
BlackMajor
0c33757b14
Fixes a few bugs
2019-11-14 18:54:57 +13:00
BlackMajor
ce94da9ed3
Merge branch 'master' into Yote
2019-11-14 17:37:57 +13:00
BlackMajor
b9a7685830
Adds dogborg catch for doggos and some
2019-11-14 17:14:14 +13:00
BlackMajor
4cd741310b
Borg changes and module compression
2019-11-11 16:35:20 +13:00
Ghommie
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
Ghommie
7e4aef46d9
Unmodularize and update pAI/Intellicards very slighty.
2019-11-03 04:23:31 +01:00
Ghommie
065fbdf0cb
Fixing gibspawner runtimes, how gruesome...
2019-11-02 19:37:35 +01:00
kevinz000 and GitHub
b172c5f691
Merge pull request #9501 from deathride58/stronksecborgs
...
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
2019-10-29 21:29:12 -07:00
BlackMajor
4806c7c788
Dogborg time
2019-10-29 02:05:43 +13:00
BlackMajor and GitHub
cc3eefff29
Merge pull request #9570 from Citadel-Station-13/kevinz000-patch-105
...
Gives peacekeeper cyborgs a megaphone
2019-10-28 17:02:34 +13:00
kevinz000 and GitHub
dabfba8a0d
Merge pull request #9619 from BlackMajor/Yote
...
Buffs engiborg build potential
2019-10-27 05:38:50 -07:00
BlackMajor
a7ecaaf977
Ok but what if light replacer
2019-10-27 15:58:51 +13:00
BlackMajor
f3cbd43d8b
What if engiborgs could actually build machines
2019-10-26 22:58:28 +13:00
kevinz000 and GitHub
4eca1ca5ad
Merge pull request #9605 from Ghommie/Ghommie-cit269
...
Unmodularize vox sounds
2019-10-25 20:09:52 -07:00
kevinz000 and GitHub
bd9443252a
Merge pull request #9579 from YakumoChen/shapeshift
...
Ports #41638 and #43784 , "Wizard Shapeshift now converts damage taken while transformed"
2019-10-24 19:13:54 -07:00
Ghommie
0da6ae549f
Unmodularize vox sounds
2019-10-24 23:02:21 +02:00
YakumoChen and GitHub
3ec63ed12d
I think I forgot this
2019-10-24 02:32:21 +00:00
Ghommie
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
YakumoChen and GitHub
ffd160ebe8
Update pai_defense.dm
2019-10-23 00:13:00 +00:00
YakumoChen and GitHub
292b997900
Update damage_procs.dm
2019-10-23 00:11:52 +00:00
kevinz000 and GitHub
07670b6644
Update robot_modules.dm
2019-10-21 17:57:30 -07:00
deathride58
b3a81dce01
Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs
2019-10-14 18:18:32 -04:00
deathride58
60749f8b07
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-11 14:33:32 -04:00
Ghommie
735755019e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-09 01:18:30 +02:00
kevinz000 and GitHub
0073d99a22
Merge pull request #9309 from Thalpy/tg-Organ-port
...
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
Ghommie
cac4157894
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-05 22:03:37 +02:00
Chayse Ramsay
8cbd7d6c06
Fixes AIs being unable to talk through holopads
2019-10-02 21:14:11 +01:00
and Fermi
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
kevinz000 and GitHub
0febc1977a
Merge pull request #9191 from Linzolle/fireman
...
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
and Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Ghommie
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
BlackMajor
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
Fermi