shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,818 Commits 5 Branches 0 Tags
5febc54fb8a1ca2a17dbc620caab17a07ef341e3
Commit Graph

26818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TrilbySpaceClone
5febc54fb8 whats all the buzz around this new drink? 2019-12-15 01:13:15 -05:00
CitadelStationBot
0921c3541a Automatic changelog generation for PR #9970 [ci skip] 2019-12-14 18:16:37 -06:00
Lin
cce63507d1 Merge pull request #9970 from Ghommie/Ghommie-cit402 
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
 2019-12-15 00:16:34 +00:00
CitadelStationBot
979807926f Automatic changelog generation for PR #10122 [ci skip] 2019-12-14 18:05:01 -06:00
Lin
49c37641a7 Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124 
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
 2019-12-15 00:04:58 +00:00
CitadelStationBot
773d574427 Automatic changelog generation for PR #10150 [ci skip] 2019-12-14 18:03:00 -06:00
Lin
1f852ea92a Merge pull request #10150 from Trilbyspaceclone/patch-245 
Corrects telegram hat icon, adds a new dog fashion to telegram hat
 2019-12-15 00:02:57 +00:00
CitadelStationBot
f24dfa6387 Automatic changelog generation for PR #10163 [ci skip] 2019-12-14 18:00:01 -06:00
Lin
43646434a0 Merge pull request #10163 from Ghommie/Ghommie-cit455 
Allows blood bank generators to be wrenched and unwrenched.
 2019-12-14 23:59:58 +00:00
CitadelStationBot
b84b54d53f Automatic changelog generation for PR #10171 [ci skip] 2019-12-14 13:04:40 -06:00
Putnam3145
bd1040ab60 Merge pull request #10171 from r4d6/patch-1 
Who the fuck put 10 shielding when you need 9?
 2019-12-14 11:04:37 -08:00
CitadelStationBot
8ddde88199 Automatic changelog generation for PR #10050 [ci skip] 2019-12-13 23:33:34 -06:00
Lin
2e003b7383 Merge pull request #10050 from Ghommie/Ghommie-cit427 
Adds view and viewers checks for ranged construction devices such as ARCD and RLD.
 2019-12-14 05:33:31 +00:00
kevinz000
659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw 
Removes medihounds (actually just makes them a medical aux sprite)
 2019-12-13 16:52:22 -07:00
r4d6
5f95e0d5a6 Remove an extra antimatter engine shielding 2019-12-13 08:17:06 -05:00
nik707
cdeb4733aa Merge pull request #9863 from BlackMajor/Yote 
No adrenals for borgs please
 2019-12-12 23:50:34 -06:00
Putnam3145
eec02ae973 Merge pull request #9757 from Ghommie/Ghommie-cit333 
porting "Split Travis shell scripts by job" and "Remove unneeded import from travis python script" with the power of patches. Also DreamChecker.
 2019-12-12 19:35:21 -08:00
Ghommie
319d4d51bb Allows blood bank generators to be wrenched and unwrenched. 2019-12-13 04:26:37 +01:00
Ghommie
5331db3ebd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit333 2019-12-13 03:46:37 +01:00
Ghommie
79328012b0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402 2019-12-13 03:41:22 +01:00
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
BlackMajor
fdbe2c4061 Merge pull request #26 from Citadel-Station-13/master 
Sync
 2019-12-13 12:44:03 +13:00
CitadelStationBot
e9eb371505 Automatic changelog generation for PR #10161 [ci skip] 2019-12-12 16:46:26 -06:00
Putnam3145
06d7b37889 Merge pull request #10161 from Ghommie/Ghommie-cit454 
Fixes raven's shuttle computer not being of the emergency shuttle type.
 2019-12-12 14:46:23 -08:00
Ghommie
911685ff0a Fixes raven's shuttle computer not being of the emergency shuttle type. 2019-12-12 23:28:50 +01:00
CitadelStationBot
8bc5580a01 Automatic changelog generation for PR #10137 [ci skip] 2019-12-12 16:18:58 -06:00
Putnam3145
5398095acf Merge pull request #10137 from KeRSedChaplain/newdeltaalert 
New delta alert sound but It works this time I swear
 2019-12-12 14:18:55 -08:00
CitadelStationBot
459db55372 Automatic changelog generation for PR #9894 [ci skip] 2019-12-12 15:20:36 -06:00
BlackMajor
725414bd03 Merge pull request #9894 from Putnam3145/real-explosion-fix 
[TESTMERGE] Explosion/bomb armor rework
 2019-12-13 10:20:33 +13:00
CitadelStationBot
d4ae3ed300 Automatic changelog generation for PR #10121 [ci skip] 2019-12-12 14:28:52 -06:00
Putnam3145
71b2754aa6 Merge pull request #10121 from kappa-sama/patch-12 
plasmafist wizard plasmafist wizard
 2019-12-12 12:28:49 -08:00
CitadelStationBot
ed822a2434 Automatic changelog generation for PR #10156 [ci skip] 2019-12-12 11:30:37 -06:00
Putnam3145
9234876ad1 Merge pull request #10156 from Ghommie/Ghommie-cit451 
Fixing character setup preview icons.
 2019-12-12 09:30:34 -08:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
CitadelStationBot
14e7f111aa Automatic changelog generation for PR #10085 [ci skip] 2019-12-11 20:14:00 -06:00
Lin
a4d52454db Merge pull request #10085 from Ghommie/Ghommie-cit440 
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
 2019-12-12 02:13:54 +00:00
kevinz000
ded283fa55 Update conveyor2.dm 2019-12-11 14:41:58 -07:00
CitadelStationBot
fe92a22b10 Automatic changelog generation for PR #10140 [ci skip] 2019-12-11 15:38:52 -06:00
kevinz000
dfec60c557 Merge pull request #10140 from Putnam3145/dynamic-not-in-secret 
Makes secret's dynamic roundstart report not tell people to contact a coder
 2019-12-11 14:38:49 -07:00
CitadelStationBot
8b9583a050 Automatic changelog generation for PR #10143 [ci skip] 2019-12-11 15:38:21 -06:00
kevinz000
77327ba899 Merge pull request #10143 from Putnam3145/dynamic-midround-doubledip 
Dynamic no longer double dips on refunds for ghost antags with not enough applicants
 2019-12-11 14:38:17 -07:00
Trilbyspaceclone
a7c8fb6470 corrects/adds a new dog fashion to telegram hat 2019-12-11 12:43:07 -05:00
CitadelStationBot
f2fc50119d Automatic changelog generation for PR #9983 [ci skip] 2019-12-10 17:52:34 -06:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
Putnam
7b10c57b5c Actually gotta rework this properly 2019-12-10 14:01:33 -08:00
Putnam
1de118d40e Dynamic no longer double dips on refunds for ghost antags 2019-12-10 13:55:58 -08:00
Putnam
7880340142 Make dynamic message in secret not bug me 2019-12-10 07:58:13 -08:00
KeRSe
e31455667e New delta alert sound 2019-12-10 00:05:59 -05:00
CitadelStationBot
a16dfb7545 Automatic changelog generation for PR #10116 [ci skip] 2019-12-09 20:31:47 -06:00
Lin
78ed78ddbc Merge pull request #10116 from Putnam3145/nolewd-fix 
Makes genital enlargement chems properly opt-outable
 2019-12-10 02:31:44 +00:00