shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,279 Commits 5 Branches 0 Tags
a2a8ab12c6b6cd66bf9c93cd805bbcd4e9e35441
Commit Graph
41279 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
siliconsandGitHub a402c20859 Merge pull request #14157 from MrJWhit/boxstation-air-alarm-fix 
Gee kevin, why does atmos get /two/ air alarms?
 2021-01-28 13:16:26 -07:00
MrJWhit ce675498f4 Gee kevin, why does atmos get /two/ air alarms? 2021-01-28 14:22:01 -05:00
zerothebigboy 0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
SmArtKar 1c23737664 Makes it compile 2021-01-28 18:16:46 +03:00
SmArtKar a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
Timothy Teakettle 938b924a37 yes 2021-01-28 11:12:27 +00:00
Artur f2343b32fe Brings back turret fixing 2021-01-28 09:39:21 +02:00
CitadelStationBot b7001453a3 Automatic changelog generation for PR #14151 [ci skip] 2021-01-27 22:21:50 -06:00
siliconsandGitHub 520e430889 Merge pull request #14151 from MrJWhit/cloak-pr,-no-actually-final,-I'm-done-othterwise 
Final, final, final cloak PR, now conflict free
 2021-01-27 21:21:47 -07:00
MrJWhit 5a75028889 neck 2021-01-27 23:17:36 -05:00
zerothebigboy c6420ae433 fuck 2021-01-27 22:59:44 -05:00
siliconsandGitHub fa2754c0fe Update human.dm 2021-01-27 20:49:56 -07:00
siliconsandGitHub 1c99225fbd Update human.dm 2021-01-27 20:48:07 -07:00
CitadelStationBot b2f369a537 Automatic changelog generation for PR #14067 [ci skip] 2021-01-27 20:11:22 -06:00
siliconsandGitHub 34cb148232 Merge pull request #14067 from TripleShades/box-chapel 
Box Chapel Redecoration [updated]
 2021-01-27 19:11:20 -07:00
Timothy Teakettle a7445316ef Update flavor_misc.dm 2021-01-28 02:11:08 +00:00
Timothy Teakettle 337611a372 Merge remote-tracking branch 'upstream/master' into caw-and-gekker 2021-01-28 02:10:11 +00:00
CitadelStationBot 58304da402 Automatic changelog generation for PR #14093 [ci skip] 2021-01-27 20:09:44 -06:00
siliconsandGitHub 1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout 
loadout part 3: custom names and descriptions
 2021-01-27 19:09:41 -07:00
siliconsandGitHub a973a3b088 Merge pull request #14145 from zeroisthebiggay/aeughfuck 
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
 2021-01-27 19:08:25 -07:00
CitadelStationBot 052edc474b Automatic changelog generation for PR #14146 [ci skip] 2021-01-27 20:08:21 -06:00
Timothy Teakettle e130e9c7e2 Update flavor_misc.dm 2021-01-28 02:08:19 +00:00
siliconsandGitHub 912b09d33b Merge pull request #14146 from zeroisthebiggay/ooffuck 
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
 2021-01-27 19:08:19 -07:00
CitadelStationBot ce616c55c9 Automatic changelog generation for PR #14147 [ci skip] 2021-01-27 20:08:03 -06:00
siliconsandGitHub af3b237846 Merge pull request #14147 from timothyteakettle/fix-miner-bedsheet 
fixes miner bedsheet
 2021-01-27 19:08:00 -07:00
CitadelStationBot f721248011 Automatic changelog generation for PR #14142 [ci skip] 2021-01-27 20:07:48 -06:00
siliconsandGitHub f623dde8df Merge pull request #14142 from zeroisthebiggay/sexmask 
adds aesthetic sterile masks (and the paper mask) to the loadout panel
 2021-01-27 19:07:45 -07:00
Changelogs 69673e7aa0 Automatic changelog compile [ci skip] 2021-01-28 00:18:29 +00:00
zerothebigboy e7d8021b81 a 2021-01-27 18:46:11 -05:00
CitadelStationBot e3fb2edd13 Automatic changelog generation for PR #14086 [ci skip] 2021-01-27 17:18:32 -06:00
LinandGitHub b1b5adb90d Merge pull request #14086 from Citadel-Station-13/silicons-patch-25 
officially adds the functionality to insert holdable mobs into colormate
 2021-01-27 17:18:29 -06:00
CitadelStationBot 08b2c365f5 Automatic changelog generation for PR #14112 [ci skip] 2021-01-27 17:16:48 -06:00
LinandGitHub f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3 
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
 2021-01-27 17:16:44 -06:00
LinandGitHub 4e3a4a30c3 Merge pull request #14139 from Citadel-Station-13/silicons-patch-2 
small refactor to pinpointers, allow pinpointers with custom targets
 2021-01-27 17:16:09 -06:00
zerothebigboy ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
Timothy Teakettle 6d6b232afe i hate shitcoders 2021-01-27 20:33:14 +00:00
zerothebigboy f3072433ff thankyoubasedrp 2021-01-27 14:56:26 -05:00
zerothebigboy ad2864f137 aeughfuck 2021-01-27 13:30:44 -05:00
Putnam3145andGitHub 2765aed0b4 Merge pull request #14085 from Citadel-Station-13/silicons-patch-24 
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
 2021-01-26 22:24:57 -08:00
Putnam3145andGitHub 8b9551b39c Merge pull request #14056 from Citadel-Station-13/silicons-patch-14 
disables rotatium due to it being horifically bugged and unmaintained
 2021-01-26 22:24:14 -08:00
Changelogs 4a8ccbe031 Automatic changelog compile [ci skip] 2021-01-27 00:16:29 +00:00
zeroisthebiggayandGitHub 4b6f0d3ffa Update mask.dm 2021-01-26 14:11:00 -05:00
zeroisthebiggayandGitHub 0bc8c9383c Update miscellaneous.dm 2021-01-26 13:17:44 -05:00
zerothebigboy 7b2a6955cc please 2021-01-26 13:13:09 -05:00
siliconsandGitHub 0a5ad34fd6 Update pinpointer.dm 2021-01-26 07:26:59 -07:00
siliconsandGitHub 93ff29a579 Update pinpointer.dm 2021-01-26 00:00:39 -07:00
CitadelStationBot b711259762 Automatic changelog generation for PR #14118 [ci skip] 2021-01-26 00:17:43 -06:00
siliconsandGitHub efc3ecef32 Merge pull request #14118 from DeltaFire15/slabs-and-silicons 
About ratvarian borgs and spells sometimes not working (+ a few other small things)
 2021-01-25 23:17:41 -07:00
CitadelStationBot d2234dc6d8 Automatic changelog generation for PR #14102 [ci skip] 2021-01-26 00:17:32 -06:00
siliconsandGitHub a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513 
[READY] somatoray buff - mutation locks + revolution ray
 2021-01-25 23:17:29 -07:00