shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,366 Commits 5 Branches 0 Tags
d100fe1d58edb8a0b1b804dcf899c06ccacb3cea
Commit Graph

40366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DeltaFire d100fe1d58 Merge pull request #13981 from MrJWhit/caution-sign 
Porting the ability to wear the caution sign (plus a random metastation fix)
 2021-01-07 20:17:03 +01:00
DeltaFire 51f8739ad8 Merge pull request #13984 from silicons/toner 
fixes removing toner from photocopiers (this is an untested fix but it probably works because it compiled)
 2021-01-07 06:31:58 +01:00
CitadelStationBot 7b3c21c072 Automatic changelog generation for PR #13978 [ci skip] 2021-01-06 23:22:09 -06:00
DeltaFire 3d09edfc4b Merge pull request #13978 from Citadel-Station-13/silicons-patch-3 
removes c4 mob gibbing
 2021-01-07 06:22:06 +01:00
DeltaFire e1aae6445e Merge pull request #13989 from Citadel-Station-13/silicons-patch-4 
[s] thingy
 2021-01-07 04:11:23 +01:00
silicons 90826aeb28 Update robot_parts.dm 2021-01-06 19:39:28 -07:00
MrJWhit 8108109965 Fixes a mistake on metastation 2021-01-06 18:04:40 -05:00
MrJWhit ba98a0aacd Update miscellaneous.dm 2021-01-06 14:42:00 -05:00
CitadelStationBot 03e8ca2e55 Automatic changelog generation for PR #13834 [ci skip] 2021-01-06 12:29:21 -06:00
DeltaFire 3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox 
ports the traitor assistant POGBOX that scales damage with tc from /TG/
 2021-01-06 19:29:17 +01:00
DeltaFire 8b876aa6e3 Merge pull request #13957 from Citadel-Station-13/silicons-patch-1 
[s] logging patch 36735734
 2021-01-06 19:23:09 +01:00
silicons 5964fd0390 fix 2021-01-06 02:12:37 -08:00
MrJWhit b9a2111a8d Fuck you travis what do you mean too many requests 2021-01-06 04:34:39 -05:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
CitadelStationBot d7c950ab20 Automatic changelog generation for PR #13961 [ci skip] 2021-01-06 00:40:14 -06:00
silicons e4e029a061 Merge pull request #13961 from MrJWhit/snipping-the-ai-thread 
Fuck it, I'll just fix a whole bunch of stuff on cogstation
 2021-01-05 23:40:07 -07:00
CitadelStationBot 00697cc7e0 Automatic changelog generation for PR #13970 [ci skip] 2021-01-06 00:39:58 -06:00
silicons e6aac9d4fb Merge pull request #13970 from TripleShades/fixies-oops 
Meta Surgery Fixies
 2021-01-05 23:39:53 -07:00
CitadelStationBot e28be2b96f Automatic changelog generation for PR #13972 [ci skip] 2021-01-06 00:39:49 -06:00
silicons 73adf82f62 Merge pull request #13972 from MrJWhit/boxstation-fix-that-only-i-care-about 
Fixing maint areas in boxstation
 2021-01-05 23:39:46 -07:00
CitadelStationBot b62fc22c89 Automatic changelog generation for PR #13968 [ci skip] 2021-01-06 00:39:40 -06:00
silicons 6c9c3cc2d8 Merge pull request #13968 from Arturlang/pray_sounds 
Ding for prayers
 2021-01-05 23:39:37 -07:00
silicons ab59a0d035 Update plastic.dm 2021-01-05 23:38:33 -07:00
TripleShades 3bb244410c oops leftover decal 2021-01-05 22:13:57 -08:00
MrJWhit 98520dc519 Update CogStation.dmm 2021-01-05 19:38:30 -05:00
MrJWhit ab856c75bb Update CogStation.dmm 2021-01-05 19:25:44 -05:00
MrJWhit f88957986f Update BoxStation.dmm 2021-01-05 16:21:37 -05:00
Lin f724554059 Merge pull request #13964 from Citadel-Station-13/silicons-patch-2 
fixes parrying working while otherwise paralyzed
 2021-01-05 16:48:20 +00:00
CitadelStationBot 7e1819edcd Automatic changelog generation for PR #13856 [ci skip] 2021-01-05 03:52:45 -06:00
silicons cfc560ed3d Merge pull request #13856 from Putnam3145/harness-tweak-2 
Actually made gear harness properly adjustable
 2021-01-05 02:52:41 -07:00
MrJWhit 1a49d9738a Update CogStation.dmm 2021-01-05 00:54:34 -05:00
MrJWhit 3fd72b9ec2 Update BoxStation.dmm 2021-01-04 20:33:36 -05:00
TripleShades 518da2ea06 Update MetaStation.dmm 2021-01-04 15:39:08 -08:00
Artur 9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
silicons c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -07:00
MrJWhit 27b5c3957f Snip snip 2021-01-04 01:26:14 -05:00
CitadelStationBot 8b18d4b3c5 Automatic changelog generation for PR #13959 [ci skip] 2021-01-03 22:37:35 -06:00
silicons d6d753e9f7 Merge pull request #13959 from necromanceranne/bokken_fixes 
Bokken Fixes: You can make them now. Nyoops.
 2021-01-03 21:37:33 -07:00
necromanceranne 0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. 2021-01-04 15:30:28 +11:00
CitadelStationBot afd1e8b5a9 Automatic changelog generation for PR #13954 [ci skip] 2021-01-03 21:19:49 -06:00
silicons a0d58cd18d Merge pull request #13954 from EmeraldSundisk/coglocks 
Cog and firelocks.
 2021-01-03 20:19:46 -07:00
zeroisthebiggay b20607cb1a Update toolbox.dm 2021-01-03 20:18:55 -05:00
CitadelStationBot f29a89c2da Automatic changelog generation for PR #13948 [ci skip] 2021-01-03 19:18:32 -06:00
silicons 4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff 
Bokken and Bokken Accessories: Bonkvengeance
 2021-01-03 18:18:29 -07:00
CitadelStationBot 68c96108b9 Automatic changelog generation for PR #13955 [ci skip] 2021-01-03 19:15:03 -06:00
silicons 3897463f0b Merge pull request #13955 from Chiirno/NightmareLightsout 
Nightmare Lights Damage Buff
 2021-01-03 18:15:00 -07:00
CitadelStationBot 81642a34a1 Automatic changelog generation for PR #13951 [ci skip] 2021-01-03 19:13:53 -06:00
silicons 7357ae3bc0 Merge pull request #13951 from BlueWildrose/CompensatingForSomething 
Max groin cannon size increased before being punished for erecting a massive mayo-blaster to -max roundstart config- inches instead of 20
 2021-01-03 18:13:50 -07:00
CitadelStationBot 1c89963be0 Automatic changelog generation for PR #13947 [ci skip] 2021-01-03 19:12:59 -06:00
silicons 8dfbf3eb87 Merge pull request #13947 from Chiirno/ChemmasterOutputFix 
Chemmaster output buff
 2021-01-03 18:12:57 -07:00