4b41a70e13
Merge pull request #9875 from Putnam3145/required-candidates-works-now
...
Makes from-ghosts rulesets cancel if fewer than required candidates
2019-11-20 21:47:48 -07:00
95951add5c
Merge pull request #9870 from Ghommie/Ghommie-cit377
...
Moves some clockie paper info to the right file.
2019-11-20 21:43:35 -07:00
34a8dc5962
Merge pull request #9850 from Ghommie/Ghommie-cit368
...
fixing a few minor issues with console frames building.
2019-11-19 21:38:58 -07:00
7503366524
Merge pull request #9853 from Ghommie/Ghommie-cit370
...
Adds a few extra cardboard cutout variants.
2019-11-19 21:38:32 -07:00
779fac99b4
Merge pull request #9829 from Ghommie/Ghommie-cit361
...
Unborking id consoles.
2019-11-19 21:33:14 -07:00
755559bb66
Merge pull request #9836 from Ghommie/Ghommie-cit364
...
Ports "Uses defines for turf atmos"
2019-11-19 21:32:42 -07:00
c7765a032b
Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak
...
Dynamic summon events tweaks
2019-11-19 21:31:14 -07:00
56413c1460
Merge pull request #9846 from KathrinBailey/IKEA-station-13
...
IKEA Station 13: Import TG's Pews
2019-11-19 21:30:56 -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
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
36d860a4ba
Makes from-ghosts ruleset cancel if fewer than required candidates
2019-11-19 20:10:06 -08:00
13f65c028f
Moves some clockie paper info to the right file.
2019-11-20 01:19:05 +01:00
2494ea4d07
Merge pull request #9824 from YakumoChen/YakumoChen-mariplush
...
Adds Marisa plushie
2019-11-19 01:55:59 -07: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
c188c20f37
Merge pull request #9802 from Ghommie/Ghommie-cit349
...
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
86072fe682
"
2019-11-18 04:15:33 +01:00
deadffe96f
missing parenthesis.
2019-11-18 03:26:04 +01:00
1c39a3bc6d
Adds a few extra cardboard cutout variants.
2019-11-18 03:23:24 +01:00
bd41cfbfc5
fixing a few minor issues with console frames building.
2019-11-17 22:44:37 +01:00
05c74c731b
Ports TG pew files
2019-11-17 14:20:44 +00:00
ba091b3a27
limited midround wizard summon events possibilities
2019-11-17 05:56:19 -08:00
641ddebed1
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
613605e0d0
Unborking id consoles.
2019-11-16 17:49:12 +01:00
5c89447cf9
Update plushes.dm
2019-11-16 09:56:57 +00: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
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
78c967fa20
A
2019-11-15 18:42:04 +01: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
009c0b46d5
Added some more blocking rules (whoops)
2019-11-14 22:28:42 -08: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
5bb6247a6d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349
2019-11-15 00:57:38 +01:00
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
d5a245945c
Merge pull request #9742 from Seris02/gpsthing
...
makes gps show location on examine
2019-11-14 16:44:40 -07:00
178aedc5cc
Merge pull request #9754 from Ghommie/Ghommie-cit330
...
porting "global to static"
2019-11-14 16:38:27 -07:00
ca99a8285c
Merge pull request #9803 from Ghommie/Ghommie-cit350
...
Ports Improved beach away mission and some fluff mapping items.
2019-11-14 16:36:19 -07:00
d6f540faf7
Merge pull request #9796 from Ghommie/Ghommie-cit347
...
Unmodularize airlocks.
2019-11-14 16:24:56 -07:00
bd650e53da
Merge pull request #9795 from Ghommie/Ghommie-cit346
...
Unmodularize areas.
2019-11-14 16:24:36 -07:00
8c247a566a
Merge pull request #9783 from Ghommie/Ghommie-cit343
...
Fixing Aux base camera RCD door settings and toggle window type actions.
2019-11-14 16:22:08 -07:00
b8f59abe34
Merge pull request #9780 from Hatterhat/fastredbutton
...
the one PR about making big red buttons detonate syndibombs faster
2019-11-14 16:15:10 -07:00
4c89b8c33f
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -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
d8e89b235f
Merge pull request #9689 from Ghommie/Ghommie-cit307
...
How many times I have encountered this sort of issue in the past and how much of a meme it was...
2019-11-14 15:50:52 -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
dfa2296758
Merge pull request #9430 from Ghommie/Ghommie-cit220
...
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -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
kevinz000