Commit Graph

17225 Commits

Author SHA1 Message Date
Seris02
b7f4580414 robotics winter coat 2019-11-17 11:50:56 +08:00
Ghommie
773b3e6605 Oh yea, now I remember why I did not port the webedit.. bhjiiiiiiin! 2019-11-17 04:11:37 +01:00
Ghommie
9a65803e04 Ports "#47709" 2019-11-17 03:59:57 +01:00
Ghommie
641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
Ghommie
6d6cc93e50 Ports "Self sustaining fix" 2019-11-17 02:59:38 +01:00
Putnam
73109f0858 Makes dynamic nukeops population scaling more like secret 2019-11-16 11:26:22 -08:00
Ghommie
613605e0d0 Unborking id consoles. 2019-11-16 17:49:12 +01:00
Putnam
f1205b4ab2 Makes meteor not repeatable. 2019-11-16 08:27:36 -08:00
Ghommie
3e6a298a6d one line shuttle fix port 2019-11-16 17:18:26 +01:00
DeltaFire15
9f8547d42d Another sync (#4)
AAAAAAAAA
2019-11-16 16:12:12 +01:00
Seris02
b146fd14f3 actually adds the winter coats 2019-11-16 18:25:05 +08: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
Seris02
8db64df364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-16 16:54:27 +08: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
Seris02
e0e3c510d4 adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats 2019-11-16 15:31:20 +08: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
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
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
kevinz000
bd650e53da Merge pull request #9795 from Ghommie/Ghommie-cit346
Unmodularize areas.
2019-11-14 16:24:36 -07:00
kevinz000
b670c94ca4 Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings
Reducing meteor warning time
2019-11-14 16:24:10 -07:00
kevinz000
81303b1225 Merge pull request #9786 from Ghommie/Ghommie-cit345
Fixing some reagents taste descriptions.
2019-11-14 16:22:54 -07:00