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

40782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp 
twinsheath additions
 2021-01-20 15:20:45 -07:00
CitadelStationBot 84453c812d Automatic changelog generation for PR #14107 [ci skip] 2021-01-20 16:17:50 -06:00
silicons 288bbcd334 Merge pull request #14107 from shellspeed1/Brings-back-mining-point-card-for-borgs 
Mining borgs get a point ID again.
 2021-01-20 15:17:47 -07:00
CitadelStationBot acee2eea95 Automatic changelog generation for PR #14109 [ci skip] 2021-01-20 16:17:40 -06:00
silicons f6a8306174 Merge pull request #14109 from Arturlang/space_tackling_meme_fix 
Fixes the space tackling meme
 2021-01-20 15:17:36 -07:00
CitadelStationBot 60200d4f0e Automatic changelog generation for PR #14110 [ci skip] 2021-01-20 16:17:15 -06:00
silicons f7c6dbd8ba Merge pull request #14110 from BlueWildrose/nicebobbertsonsyougotthere 
Removes oversized genitalia analysis from medical scanners
 2021-01-20 15:17:12 -07:00
silicons 9f50ea66c8 Merge pull request #14104 from LetterN/semi-sync 
[s] semi sync- we forgot the anti ddos thing
 2021-01-20 15:14:37 -07:00
CitadelStationBot da412a2269 Automatic changelog generation for PR #14097 [ci skip] 2021-01-20 15:20:54 -06:00
Lin d262f366e7 Merge pull request #14097 from Citadel-Station-13/silicons-patch-28 
i'm not sure why cargo's bird crate has every bird spawn with a headset but let's not have that
 2021-01-20 15:20:50 -06:00
CitadelStationBot f1f6e35804 Automatic changelog generation for PR #14094 [ci skip] 2021-01-20 10:45:55 -06:00
Putnam3145 2debe930fc Merge pull request #14094 from kittycat2002/master 
Gives /datum/reagent/consumable/ethanol/species_drink a name
 2021-01-20 08:45:52 -08:00
Blue Wildrose 80ccc93fd7 Removes breast and penis analysis from medical scanners 2021-01-20 07:32:03 -07:00
Artur 5aa710ffd7 spess 2021-01-20 16:05:20 +02:00
Artur ef950400a4 Fixes the space tackling meme 2021-01-20 15:50:41 +02:00
shellspeed1 81e37b6e33 Update robot_modules.dm 2021-01-19 21:40:47 -08:00
DeltaFire 1057721d2a Merge pull request #14106 from Citadel-Station-13/silicons-patch-29 
let's pretend this didn't happen move along nothing to see here (fixes hood toggles)
 2021-01-20 06:32:01 +01:00
silicons ae5cb78424 Update toggles.dm 2021-01-19 22:27:13 -07:00
Letter N a68957dcc4 wow thanks tabnine 😂 2021-01-20 12:02:20 +08:00
Letter N 6547028272 what the fuck?? 2021-01-20 11:56:44 +08:00
Letter N 9fa6958a99 OH FUCK 2021-01-20 11:49:53 +08:00
Letter N 02ca168df3 why are we building windows facing nothing but rock infront of it? 2021-01-20 11:37:44 +08:00
Letter N 021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
CitadelStationBot 4a3fe48710 Automatic changelog generation for PR #13610 [ci skip] 2021-01-19 20:29:29 -06:00
silicons 2b16435033 Merge pull request #13610 from Putnam3145/fix-eq-hogging 
Makes the atmos subsystem pause correctly
 2021-01-19 19:29:19 -07:00
Letter N 2e2a609d4b Merge remote-tracking branch 'origin/master' into semi-sync 2021-01-20 10:24:28 +08:00
Letter N c08765d0eb let's not get ddosed 2021-01-20 10:23:30 +08:00
Putnam a1b208f1da Revert "Update json_verifier.py" 
This reverts commit 3c43345ff6.
 2021-01-19 18:23:08 -08:00
Putnam 3c43345ff6 Update json_verifier.py 2021-01-19 18:22:50 -08:00
CitadelStationBot 131b11f4ae Automatic changelog generation for PR #13826 [ci skip] 2021-01-19 19:22:11 -06:00
Putnam3145 f7f9185073 Merge pull request #13826 from LetterN/semi-sync 
/tg/ ""hardsync"" part one of many*
 2021-01-19 17:22:05 -08:00
Hatterhat fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
CitadelStationBot b1fb0b3095 Automatic changelog generation for PR #14089 [ci skip] 2021-01-19 12:46:17 -06:00
Lin 11ab32d8d6 Merge pull request #14089 from MrJWhit/mining-station-minor-QoL 
Minor minning station QoL
 2021-01-19 12:46:13 -06:00
silicons 83566cdbe3 Update parrot.dm 2021-01-19 05:23:43 -07:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons f0a9a7a179 fix 2021-01-19 04:21:21 -07:00
CitadelStationBot e6e9a22615 Automatic changelog generation for PR #14082 [ci skip] 2021-01-18 22:19:19 -06:00
Lin 16e2470e6b Merge pull request #14082 from kappa-sama/patch-45 
s
 2021-01-18 22:19:15 -06:00
Lin 1fa2b7b331 Merge pull request #14084 from Citadel-Station-13/silicons-patch-23 
robots don't get tired from swimming
 2021-01-18 20:39:57 -06:00
kittycat2002 b46caa77af Gives /datum/reagent/consumable/ethanol/species_drink a name 
This fixes an issue that occurs when attempting to find Ethanol by name using get_chem_id.
 2021-01-18 21:39:34 -05:00
Lin 58dde0f60e Merge pull request #14045 from Citadel-Station-13/silicons-patch-9 
gorilla pais
 2021-01-18 13:22:51 -06:00
Lin 5eafdd164f Merge pull request #14069 from Citadel-Station-13/silicons-patch-18 
moves say_emphasis from compose_message to lang_treat to prevent _underlines_ from colliding with command_headset spans having _ in it
 2021-01-18 13:21:13 -06:00
Lin 73213b4bad Merge pull request #14079 from LetterN/patch-3 
Fixes this vending oversight
 2021-01-18 13:17:05 -06:00
Lin 61d4f2cdad Merge pull request #14080 from Citadel-Station-13/silicons-patch-21 
hooded suits now sync colors to their hood on extend
 2021-01-18 13:13:00 -06:00
Putnam3145 51fc5ae235 Merge pull request #14053 from Citadel-Station-13/silicons-patch-13 
"Make it so you can squeeze someone's hand when you hold it"
 2021-01-18 10:17:56 -08:00
Putnam3145 db66e6634b Merge pull request #14091 from Citadel-Station-13/silicons-patch-26 
[s] UM
 2021-01-18 10:16:19 -08:00
silicons 0229078b58 Update foam_dart.dm 2021-01-18 02:32:21 -07:00
MrJWhit 4f49dab040 Update Mining_Station_Public_01.dmm 2021-01-18 01:57:05 -05:00
CitadelStationBot 7ad42c9d53 Automatic changelog generation for PR #13963 [ci skip] 2021-01-17 21:43:27 -06:00