kevinz000
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
Ghommie
b78da82336
Honkbot slip and slide fun ride.
2019-11-20 04:03:57 +01:00
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
BlackMajor
1b1ed21f42
No adrenals for borgs please
2019-11-19 22:13:22 +13:00
kevinz000
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
Ghommie
63a3919ed2
Fixing gasping xenos.
2019-11-18 20:58:22 +01:00
Ghommie
21c1f8bc2a
Fixing suit store overlays
2019-11-18 15:19:39 +01:00
lolman360
4d71f95b16
Merge branch 'master' into HeadCorgi
2019-11-17 12:24:04 +11:00
lolman360
8a54a73be4
e
2019-11-17 12:12:46 +11:00
lolman360
aed866339f
pickup pickup pickup pickup 100% pickup
2019-11-17 12:00:17 +11:00
kevinz000
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
kevinz000
66f8b5f404
Merge pull request #9769 from Ghommie/Ghommie-cit336
...
ID console fixes and other tweaks.
2019-11-16 01:17:23 -07:00
Ghommie
7a1f3dcdba
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
2019-11-15 23:14:28 +01: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
Ghommie
2b104a7698
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-15 18:40:45 +01:00
Putnam
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
lolman360
57bd0f5fb8
Revert "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS"
...
This reverts commit bc6c617c27
2019-11-15 16:42:34 +11:00
lolman360
bc6c617c27
DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS
2019-11-15 16:42:26 +11:00
Ghommie
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
Ghommie
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
Ghommie
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
kevinz000
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
kevinz000
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
kevinz000
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
kevinz000
318c03cc28
Merge pull request #9683 from Ghommie/Ghommie-cit303
...
Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
kevinz000
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
kevinz000
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
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
Ghommie
baedb7e091
I'm unprofessional.
2019-11-14 15:16:06 +01:00
Ghommie
7603db2e8b
Bad habit of pushing things before the compile.
2019-11-14 15:10:32 +01:00
Ghommie
358db4f390
Dreamchecker compatibility changes, part 2.
2019-11-14 14:54:12 +01:00
Putnam
304ce37d6c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
2019-11-14 02:23:48 -08:00
kevinz000
3015ec5c04
Merge pull request #9764 from Ghommie/Ghommie-cit335
...
Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07: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
Putnam
5e51cc63f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
2019-11-13 16:58:44 -08:00
kevinz000
4e3147b228
Merge pull request #9755 from Ghommie/Ghommie-cit331
...
lentext to length, yet another 513 requirement.
2019-11-12 23:59:31 -07:00
Ghommie
c5a7c28a1b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-11-12 16:04:05 +01:00
Ghommie
9fb70c8af9
Ghommie rants, comment syntax is at stake.
2019-11-12 06:40:30 +01:00
Ghommie
176a757f62
Fixing suit overlays compatibility with items again.
2019-11-12 06:33:06 +01:00
Ghommie
63da5ffb13
ID console fixes and other tweaks.
2019-11-11 17:10:14 +01:00
BlackMajor
4cd741310b
Borg changes and module compression
2019-11-11 16:35:20 +13:00
Ghommie
e0afed1f8e
QoL dullahan ahealing.
2019-11-11 00:39:19 +01:00
Ghommie
4c1eba0d81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
2019-11-10 23:52:48 +01:00
Ghommie
e977ba6729
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-11-10 23:17:58 +01:00
Ghommie
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
