shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,055 Commits 5 Branches 0 Tags
e7523862ebbe19ced56cd60402eb7ea287923bce
Commit Graph

5842 Commits

Author SHA1 Message Date
Winter Flare
03dae580a9 Minor QoL and Wardrobe Updates 2019-11-22 14:08:12 -05:00
Lin
1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245 
Touching up job outfits equip procs, little PDA fix.
 2019-11-22 02:37:49 +00:00
Lin
3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243 
Ports "You can now click on objects and mobs below flaps and signs"
 2019-11-22 01:36:47 +00:00
Lin
c2d182d50d Merge pull request #9823 from Seris02/wintergalorefix 
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
 2019-11-22 01:16:35 +00:00
Lin
2412bad483 Merge pull request #9889 from GrayRachnid/fixgoldbox 
Fixes gold toolbox inhand sprite having the wrong name
 2019-11-22 01:14:39 +00:00
kevinz000
c22ae596fc Merge pull request #9880 from Putnam3145/meteor-random-fix 
Makes sure every dynamic-triggered event isn't random on dynamic
 2019-11-20 22:12:42 -07:00
kevinz000
1efd3ae395 Merge pull request #9866 from Useroth/tatorstrangeseeds 
Adds strange seeds as a buyable traitor botanist item.
 2019-11-20 22:09:53 -07:00
Seris02
60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
kevinz000
42de0d5ebe Merge pull request #9831 from Putnam3145/dynamic-nukeops-pop-fix 
Makes dynamic nukeops population scaling more like secret
 2019-11-20 22:01:49 -07:00
kevinz000
540a57b518 Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat 
Makes meteor not repeatable in dynamic.
 2019-11-20 21:53:05 -07:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353 
Dreamchecker compatibility changes, part 2.
 2019-11-20 21:49:58 -07:00
kevinz000
c503e564db Merge pull request #9873 from Ghommie/Ghommie-cit378 
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
 2019-11-20 21:48:41 -07:00
kevinz000
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
kevinz000
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
GrayRachnid
4ae76cf1d9 WHY 
D
 2019-11-20 23:11:46 -05:00
GrayRachnid
48d1bd1160 fixes goldbox 2019-11-20 18:47:35 -05:00
Useroth
e2c8efa824 Oopsie. I need to stop committing code without comipiling. 2019-11-20 15:36:55 +01:00
Useroth
2a8152c835 Applied suggestions. 2019-11-20 15:15:10 +01:00
Putnam
f7361c2059 Made sure every dynamic-controlled event doesn't randomly trigger on dynamic. 2019-11-19 21:58:55 -08:00
kevinz000
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
kevinz000
7503366524 Merge pull request #9853 from Ghommie/Ghommie-cit370 
Adds a few extra cardboard cutout variants.
 2019-11-19 21:38:32 -07:00
kevinz000
779fac99b4 Merge pull request #9829 from Ghommie/Ghommie-cit361 
Unborking id consoles.
 2019-11-19 21:33:14 -07:00
kevinz000
755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364 
Ports "Uses defines for turf atmos"
 2019-11-19 21:32:42 -07:00
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
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
Putnam
36d860a4ba Makes from-ghosts ruleset cancel if fewer than required candidates 2019-11-19 20:10:06 -08:00
Ghommie
7c0c14e059 Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit 2019-11-20 03:35:06 +01:00
Ghommie
13f65c028f Moves some clockie paper info to the right file. 2019-11-20 01:19:05 +01:00
Useroth
5169205a19 Added a 10pack as well 2019-11-19 19:35:37 +01: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
Lin
c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349 
Unmodularize bikehorns and holy weapons.
 2019-11-19 03:24:38 +00:00
Ghommie
86072fe682 " 2019-11-18 04:15:33 +01:00
Ghommie
deadffe96f missing parenthesis. 2019-11-18 03:26:04 +01:00
Ghommie
1c39a3bc6d Adds a few extra cardboard cutout variants. 2019-11-18 03:23:24 +01:00
Ghommie
bd41cfbfc5 fixing a few minor issues with console frames building. 2019-11-17 22:44:37 +01: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
641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +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
Seris02
b146fd14f3 actually adds the winter coats 2019-11-16 18:25:05 +08:00
YakumoChen
5c89447cf9 Update plushes.dm 2019-11-16 09:56:57 +00: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
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
78c967fa20 A 2019-11-15 18:42:04 +01:00