kevinz000
c7765a032b
Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak
...
Dynamic summon events tweaks
2019-11-19 21:31:14 -07:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
877b79ae1c
Merge pull request #9822 from Putnam3145/dynamic-wizard-rework
...
Reworked how wizard spells interact with dynamic
2019-11-19 21:29:09 -07:00
kevinz000
63899bdc3d
Merge pull request #9827 from Ghommie/Ghommie-cit360
...
one line shuttle fix port
2019-11-19 21:28:50 -07:00
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
deathride58
cb70f47a48
Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115
...
modifies donator config entry to allow multiple ckeys per line
2019-11-19 13:38:20 -05:00
kevinz000
2494ea4d07
Merge pull request #9824 from YakumoChen/YakumoChen-mariplush
...
Adds Marisa plushie
2019-11-19 01:55:59 -07: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
kevinz000
84e84355c3
Update code/controllers/configuration/config_entry.dm
...
Co-Authored-By: Lin <linzolle@gmail.com >
2019-11-19 01:07:43 -07:00
BlackMajor
31c59b7cad
fixes upgrades removing dogborg stuff
2019-11-19 20:50:59 +13:00
Lin
c188c20f37
Merge pull request #9802 from Ghommie/Ghommie-cit349
...
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
Lin
512939f1e6
Merge pull request #9730 from Citadel-Station-13/kevinz000-patch-112
...
kinetic crushers no longer drop if you try to use it with one hand
2019-11-19 03:23:12 +00:00
KathrinBailey
05c74c731b
Ports TG pew files
2019-11-17 14:20:44 +00:00
Putnam
ba091b3a27
limited midround wizard summon events possibilities
2019-11-17 05:56:19 -08:00
Ghommie
3e6a298a6d
one line shuttle fix port
2019-11-16 17:18:26 +01:00
kevinz000
d9b24b20d1
Merge pull request #9817 from Ghommie/Ghommie-cit357
...
Fixing a keybinding issue.
2019-11-16 03:02:43 -07:00
YakumoChen
5c89447cf9
Update plushes.dm
2019-11-16 09:56:57 +00:00
Putnam
a85142053d
Makes it refund threat too (wow, didn't even think about it!)
2019-11-16 00:43:44 -08:00
Putnam
c9de03675e
actually no i'm reworking this
2019-11-16 00:36:09 -08: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
GrayRachnid
c1dfa4227b
ok this works and i don't know why
2019-11-16 00:52:52 -05:00
GrayRachnid
206f3df25c
i hate dogborgs and pixel_x
2019-11-16 00:41:55 -05: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
978b675986
FUCK
2019-11-15 20:12:54 +01:00
Ghommie
78c967fa20
A
2019-11-15 18:42:04 +01:00
Ghommie
2b104a7698
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-15 18:40:45 +01:00
Putnam
4f06a25951
Made staff of change require/cost threat
2019-11-14 23:26:59 -08: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
Putnam
009c0b46d5
Added some more blocking rules (whoops)
2019-11-14 22:28:42 -08:00
Putnam
e68ad13983
Reduced RNG a bit more
2019-11-14 22:24:43 -08:00
kevinz000
b8c45ba6a1
Update donator.dm
2019-11-14 18:26:50 -07:00
kevinz000
0dcb2d3b9c
Update config_entry.dm
2019-11-14 18:25:52 -07:00
kevinz000
3624f90c45
Update donator_groupings.dm
2019-11-14 18:22:59 -07:00
kevinz000
e8938f52a7
Update donator.dm
2019-11-14 18:22:21 -07:00
kevinz000
a3ad224e0f
Update config_entry.dm
2019-11-14 18:21:08 -07: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
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
kevinz000
746bbccb9c
Merge pull request #9723 from Ghommie/Ghommie-cit321
...
Riding component fix and hacky mood runtimes workaround.
2019-11-14 16:46:54 -07:00
kevinz000
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
kevinz000
d5a245945c
Merge pull request #9742 from Seris02/gpsthing
...
makes gps show location on examine
2019-11-14 16:44:40 -07:00
kevinz000
178aedc5cc
Merge pull request #9754 from Ghommie/Ghommie-cit330
...
porting "global to static"
2019-11-14 16:38:27 -07:00
kevinz000
40523802f3
Merge pull request #9804 from Ghommie/Ghommie-cit351
...
Unmodularize keybindings.
2019-11-14 16:36:55 -07:00
kevinz000
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
kevinz000
5b5e655b18
Merge pull request #9801 from Ghommie/Ghommie-cit348
...
Fixing anti-meta hidden random event reports.
2019-11-14 16:28:07 -07:00
kevinz000
d6f540faf7
Merge pull request #9796 from Ghommie/Ghommie-cit347
...
Unmodularize airlocks.
2019-11-14 16:24:56 -07:00
