shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,425 Commits 5 Branches 0 Tags
f670d09a88dfa8e40978e609aa1ec287c141b602
Commit Graph

31425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Putnam
f670d09a88 Made IAA work again (whoops) 2020-03-06 21:39:38 -08:00
Putnam
39527ae4a7 prevented hijack/martyr from being contractors 2020-03-06 17:21:41 -08:00
Putnam
1c37b95c0b renamed "gimmick" to "freeform" 2020-03-06 17:21:30 -08:00
Putnam
71ac07426a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types 2020-03-06 17:03:24 -08:00
Putnam
182e98192c no longer uses that var 2020-03-06 17:01:43 -08:00
Putnam
436e781ec9 Removed assassin-only, made subterfuge more likely to assassinate 2020-03-06 15:37:59 -08:00
CitadelStationBot
4dfa3ec3cf Automatic changelog generation for PR #11367 [ci skip] 2020-03-06 17:15:16 -06:00
Ghom
0e8d1041a4 Merge pull request #11367 from Trilbyspaceclone/patch-303 
Corrects arrow crafting
 2020-03-07 00:15:13 +01:00
Trilbyspaceclone
c2e56f156f Update recipes_weapon_and_ammo.dm 2020-03-06 17:18:10 -05:00
CitadelStationBot
928c389b17 Automatic changelog generation for PR #11336 [ci skip] 2020-03-06 14:47:17 -06:00
Ghom
65b7833738 Merge pull request #11336 from Putnam3145/mkultra-aaa 
Makes MKUltra's explosion no longer spread prefbreak gas
 2020-03-06 21:47:14 +01:00
CitadelStationBot
65b9fd8f70 Automatic changelog generation for PR #11298 [ci skip] 2020-03-06 08:23:33 -06:00
Ghom
c6c676ceb5 Merge pull request #11298 from Kraseo/contracties 
Ports TG's Syndicate Contractors
 2020-03-06 15:23:30 +01:00
CitadelStationBot
b1cc622097 Automatic changelog generation for PR #11334 [ci skip] 2020-03-06 08:09:46 -06:00
Ghom
75aa5ebc95 Merge pull request #11334 from Putnam3145/power-sink-suck 
Made power sink objective more feasible
 2020-03-06 15:09:43 +01:00
Ghom
7eb4607a47 Merge pull request #11355 from Ragolution/honk-in-your-hands 
fix quintuple sec mix_sound def
 2020-03-06 14:53:11 +01:00
Ragolution
597e1210f3 fix quintuple sec mix_sound def 
Fixes mix_sound for Quintuple Sec being assigned to mix_message. The fact that this was never reported before proves how infrequently people actually make quintuple sec.
 2020-03-06 08:38:33 -05:00
Ghom
4b3725bb43 Merge pull request #11348 from Citadel-Station-13/kevinz000-patch-19 
fixes pool mist garbage collection
 2020-03-06 14:20:58 +01:00
CitadelStationBot
a7673a7c1e Automatic changelog generation for PR #11222 [ci skip] 2020-03-06 06:48:06 -06:00
Ghom
f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers 
Ashwalkers now can make a well, got their livestock back and more!
 2020-03-06 13:48:03 +01:00
Trilbyspaceclone
5b808c511f better seeds 2020-03-06 07:09:16 -05:00
Kraseo
2b4056765d i am not asking anymore 2020-03-06 12:25:38 +01:00
Kraseo
87773343c1 marks area/ruin/space as outdoors so it's not a valid dropoff location 2020-03-06 12:08:32 +01:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
kevinz000
3af4862be6 Update pool_controller.dm 2020-03-06 02:09:39 -07:00
kevinz000
0a68143a3e Merge pull request #11297 from Ghommie/Ghommie-cit597 
some dozens lines about some update_overlays issues and cryopods/MMIs.
 2020-03-06 00:20:54 -07:00
CitadelStationBot
1289f628b8 Automatic changelog generation for PR #11306 [ci skip] 2020-03-06 01:20:39 -06:00
kevinz000
29727b2fc9 Merge pull request #11306 from Ghommie/Ghommie-cit598 
Removes makeshift switchblades
 2020-03-06 00:20:36 -07:00
kevinz000
ae97cec8b4 Merge pull request #11309 from Citadel-Station-13/Ghommie-patch-1 
The lavaland elite tumor shard revival now fetches the mob's ghost.
 2020-03-06 00:20:18 -07:00
kevinz000
d376b99af6 Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2 
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
 2020-03-06 00:19:51 -07:00
CitadelStationBot
61121abc69 Automatic changelog generation for PR #11316 [ci skip] 2020-03-06 01:19:29 -06:00
kevinz000
5ebf8ef1e3 Merge pull request #11316 from Citadel-Station-13/Ghommie-patch-3 
Makes cargo passive point generation 125 a minute and not 2 or so every tick.
 2020-03-06 00:19:26 -07:00
kevinz000
f1d9725bd8 Merge pull request #11319 from Ghommie/Ghommie-cit599 
Fixes and improves RCL sprite update procs.
 2020-03-06 00:17:53 -07:00
CitadelStationBot
9d12480aa5 Automatic changelog generation for PR #11323 [ci skip] 2020-03-06 01:17:25 -06:00
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600 
Porting a couple material datums code updates and fixes.
 2020-03-06 00:17:21 -07:00
CitadelStationBot
ed59161bb4 Automatic changelog generation for PR #11324 [ci skip] 2020-03-06 01:17:12 -06:00
kevinz000
23fa750e31 Merge pull request #11324 from Trilbyspaceclone/patch-302 
Makes medical hardsuits have built in huds
 2020-03-06 00:17:09 -07:00
CitadelStationBot
5aaca75106 Automatic changelog generation for PR #11330 [ci skip] 2020-03-06 01:14:45 -06:00
kevinz000
78b1dcaae4 Merge pull request #11330 from Citadel-Station-13/Ghommie-patch-4 
Allows blobbernauts to drag objects (but not mobs) again.
 2020-03-06 00:14:43 -07:00
kevinz000
dac74ccf2d Merge pull request #11331 from Ghommie/Ghommie-cit602 
Fixing one hell of a gibs runtime.
 2020-03-06 00:14:28 -07:00
kevinz000
9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603 
Replaces EXCEPTION() with stack_trace() and CRASH()
 2020-03-06 00:14:13 -07:00
Ghom
859cde2065 Update watercloset.dm 2020-03-06 05:43:31 +01:00
Ghom
5c67c71e90 Update towercap.dm 2020-03-06 05:41:49 +01:00
Ghom
b80acdfaa6 Update glass.dm 2020-03-06 05:39:18 +01:00
Ghom
97ddde304b NO COMMENTS IN MAP FILES 2020-03-06 05:36:05 +01:00
CitadelStationBot
5250fa1db1 Automatic changelog generation for PR #10451 [ci skip] 2020-03-05 19:03:59 -06:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags 
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
 2020-03-05 20:03:56 -05:00
CitadelStationBot
3214fc18c1 Automatic changelog generation for PR #11064 [ci skip] 2020-03-05 18:25:05 -06:00
Ghom
5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants 
3 new arm tool set implants
 2020-03-06 01:25:02 +01:00
CitadelStationBot
524ecae0f0 Automatic changelog generation for PR #11328 [ci skip] 2020-03-05 18:21:11 -06:00