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

40441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons 536ae34ea7 Merge pull request #14005 from DeltaFire15/AAAAAAAAAAAAA 
Stops mob loot from failing to Initialize
 2021-01-08 18:09:36 -07:00
DeltaFire 56a2892fd3 sigh 2021-01-08 23:48:32 +01:00
CitadelStationBot 76cb637f9d Automatic changelog generation for PR #13871 [ci skip] 2021-01-08 02:26:55 -06:00
Putnam3145 5cde6e0157 Merge pull request #13871 from silicons/debris 
Merry Christmas - GIVING JANITORS A JOB
 2021-01-08 00:26:52 -08:00
CitadelStationBot a3f226acf7 Automatic changelog generation for PR #13967 [ci skip] 2021-01-08 02:20:26 -06:00
silicons dc02c8cf74 Merge pull request #13967 from keronshb/blobtweaks 
Small blob tweaks + fix
 2021-01-08 01:20:23 -07:00
CitadelStationBot 9741c4ab38 Automatic changelog generation for PR #13976 [ci skip] 2021-01-08 02:14:57 -06:00
silicons 2c8326df35 Merge pull request #13976 from timothyteakettle/bread 
i have done nothing but teleport bread for three days
 2021-01-08 01:14:54 -07:00
CitadelStationBot b348cb7e7f Automatic changelog generation for PR #13996 [ci skip] 2021-01-08 02:12:33 -06:00
silicons 4143564a67 Merge pull request #13996 from MrJWhit/morph-becoming-an-ai-fix 
Port of: Prevents the morph from become an AI eye
 2021-01-08 01:12:30 -07:00
CitadelStationBot ef6294866b Automatic changelog generation for PR #14001 [ci skip] 2021-01-08 02:12:26 -06:00
silicons 4370c0c78a Merge pull request #14001 from MrJWhit/metafix 
Only one chair per tile, thanks metastation 2
 2021-01-08 01:12:23 -07:00
MrJWhit cb7d81a8e1 Update MetaStation.dmm 2021-01-08 02:41:45 -05:00
silicons 407b1fe071 Update humans.dm 2021-01-07 23:14:59 -07:00
CitadelStationBot 4e3a524708 Automatic changelog generation for PR #13997 [ci skip] 2021-01-08 00:12:42 -06:00
silicons 92fee9c0a2 Merge pull request #13997 from MrJWhit/The-garbage-collector-doesn't-waste-time-anymore 
The garbage collector doesn't waste time anymore
 2021-01-07 23:12:39 -07:00
MrJWhit cc2bcfedf1 Update garbage.dm 2021-01-07 22:50:03 -05:00
MrJWhit 1dfed73406 Travis make my shit work 2021-01-07 22:09:26 -05:00
CitadelStationBot 307cc4a64a Automatic changelog generation for PR #13931 [ci skip] 2021-01-07 19:59:50 -06:00
DeltaFire d153d82441 Merge pull request #13931 from shellspeed1/porting-turret 
Ports disposable sentry gun for station engineers as a traitor item from TG
 2021-01-08 02:59:48 +01:00
MrJWhit 784fca8bd4 Hehe fixies 2021-01-07 20:59:37 -05:00
CitadelStationBot df63f6462f Automatic changelog generation for PR #13988 [ci skip] 2021-01-07 19:08:34 -06:00
Lin b7cf425dff Merge pull request #13988 from DeltaFire15/who-reads-these-anyways 
[s] we love private orders
 2021-01-08 01:08:31 +00:00
shellspeed1 a25af6ea0c Update uplink_roles.dm 2021-01-07 16:53:09 -08:00
silicons eeb4807d3f Merge pull request #13982 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/axios-0.21.1 
Bump axios from 0.19.2 to 0.21.1 in /tgui
 2021-01-07 17:22:52 -07:00
CitadelStationBot f7f4656c64 Automatic changelog generation for PR #13980 [ci skip] 2021-01-07 18:22:45 -06:00
silicons f06a7c1ec3 Merge pull request #13980 from MrJWhit/first-things-first 
Makes gas sensors fireproof
 2021-01-07 17:22:41 -07:00
CitadelStationBot a342e099af Automatic changelog generation for PR #13983 [ci skip] 2021-01-07 18:22:31 -06:00
silicons 21101e62dd Merge pull request #13983 from shellspeed1/xenohybrid-stuff 
Adds some flavor stuff for the xenohybrid species tongue as well as wings. No longer includes language.
 2021-01-07 17:22:28 -07:00
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
Timothy Teakettle 44667ae1b6 edits 2021-01-07 16:46:42 +00: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
shellspeed1 926b4ca609 Merge branch 'porting-turret' of https://github.com/shellspeed1/Citadel-Station-13 into porting-turret 2021-01-06 18:48:47 -08:00
shellspeed1 21e81faff5 Update traitordevices.dm 2021-01-06 18:48:02 -08:00
shellspeed1 b5e8d3308c Update traitordevices.dm 2021-01-06 18:40:49 -08:00
silicons 90826aeb28 Update robot_parts.dm 2021-01-06 19:39:28 -07:00
shellspeed1 67364f4254 Update traitordevices.dm 2021-01-06 18:26:07 -08:00
DeltaFire e37790a997 fix 2021-01-07 00:23:18 +01:00
MrJWhit 8108109965 Fixes a mistake on metastation 2021-01-06 18:04:40 -05:00
shellspeed1 0144a06964 Removes language to be done later 2021-01-06 11:59:37 -08: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
shellspeed1 98f8af853c Minor xenohybrid changeschanges 
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
 2021-01-06 01:58:58 -08:00
MrJWhit b9a2111a8d Fuck you travis what do you mean too many requests 2021-01-06 04:34:39 -05:00