shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,662 Commits 5 Branches 0 Tags
1346e88e6bf64c98131f9df769b72efbf288fb35
Commit Graph

13662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TehZombehz
1346e88e6b Fix for invisible heartboxes 2018-02-13 18:08:38 -06:00
deathride58
88098fe2e1 Merge pull request #5466 from Citadel-Station-13/upstream-merge-35642 
[MIRROR] [s]Fixes blacklisted byond builds
 2018-02-13 23:05:32 +00:00
CitadelStationBot
c354420afd [s]Fixes blacklisted byond builds 2018-02-13 16:48:48 -06:00
vuonojenmustaturska
6a094232bc Merge pull request #35642 from MrStonedOne/patch-482 
[s]Fixes blacklisted byond builds
 2018-02-13 16:48:48 -06:00
CitadelStationBot
900fab0bf2 Automatic changelog generation for PR #5465 [ci skip] 2018-02-13 15:24:20 -06:00
deathride58
637720a3d9 Merge pull request #5465 from Citadel-Station-13/upstream-merge-35597 
[MIRROR] The Cook now only works under siege.
 2018-02-13 21:24:18 +00:00
CitadelStationBot
a2c1aac79b Automatic changelog generation for PR #5464 [ci skip] 2018-02-13 15:23:50 -06:00
deathride58
6bb8418aeb Merge pull request #5464 from Citadel-Station-13/upstream-merge-35583 
[MIRROR] Adds heart-shaped boxes of chocolate to the valentines event
 2018-02-13 21:23:48 +00:00
CitadelStationBot
08090a2be4 The Cook now only works under siege. 2018-02-13 14:18:50 -06:00
Iamgoofball
5793fe893f The Cook now only works under siege. (#35597) 
The chef's CQC skill now only works in the kitchen area
 2018-02-13 14:18:49 -06:00
oranges
e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
LetterJay
c52562fed3 Update __donator.dm 2018-02-13 12:10:24 -06:00
deathride58
cdcf5f8982 Merge pull request #5461 from Citadel-Station-13/upstream-merge-35575 
[MIRROR] Fixes communications console runtime
 2018-02-13 17:19:00 +00:00
deathride58
fd707fa9d0 Merge pull request #5460 from Citadel-Station-13/upstream-merge-35571 
[MIRROR] Fixes spider_infestation event
 2018-02-13 17:18:45 +00:00
CitadelStationBot
fb764c77de Fixes communications console runtime 2018-02-13 10:29:47 -06:00
vuonojenmustaturska
d44ccdb009 Merge pull request #35575 from ShizCalev/communications-console-runtime 
Fixes communications console runtime
 2018-02-13 10:29:47 -06:00
LetterJay
311463c03d Merge pull request #5459 from Citadel-Station-13/upstream-merge-35574 
[MIRROR] Sanity check for sentience event
 2018-02-13 10:27:09 -06:00
LetterJay
42c197b1df Merge pull request #5458 from Citadel-Station-13/upstream-merge-35625 
[MIRROR] Removes the empty moth language file
 2018-02-13 10:26:57 -06:00
CitadelStationBot
cfa421bcd4 Fixes spider_infestation event 2018-02-13 10:23:28 -06:00
vuonojenmustaturska
3c9966041d Merge pull request #35571 from ShizCalev/spider_infestation-fix 
Fixes spider_infestation event
 2018-02-13 10:23:28 -06:00
CitadelStationBot
cdc8eea447 Sanity check for sentience event 2018-02-13 10:00:47 -06:00
vuonojenmustaturska
a103a44252 Merge pull request #35574 from ShizCalev/sentience-fix 
Sanity check for sentience event
 2018-02-13 10:00:47 -06:00
deathride58
322d8aa480 Merge pull request #5457 from Citadel-Station-13/upstream-merge-35565 
[MIRROR] Fixes invalid throwat args
 2018-02-13 15:02:20 +00:00
CitadelStationBot
f2b2bfbf98 Removes the empty moth language file 2018-02-13 08:55:12 -06:00
Leo
6d980b488d Merge pull request #35625 from praisenarsie/patch-31 
Removes the empty moth language file
 2018-02-13 08:55:12 -06:00
CitadelStationBot
91f5b571e9 Fixes invalid throwat args 2018-02-13 07:14:47 -06:00
ShizCalev
833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
LetterJay
d7a7bea995 Merge pull request #5439 from Citadel-Station-13/upstream-merge-35512 
[MIRROR] Split up Revert/Removal
 2018-02-13 06:28:42 -06:00
LetterJay
de4869542c Merge pull request #5443 from Citadel-Station-13/upstream-merge-35551 
[MIRROR] Tests give 3 GBP
 2018-02-13 06:28:33 -06:00
CitadelStationBot
306e51f9bf Automatic changelog generation for PR #5456 [ci skip] 2018-02-13 06:28:17 -06:00
LetterJay
66a2e037e7 Merge pull request #5456 from Citadel-Station-13/upstream-merge-35560 
[MIRROR] Adds hooray emoji
 2018-02-13 06:28:15 -06:00
LetterJay
7cf942250c Merge pull request #5455 from Citadel-Station-13/upstream-merge-35572 
[MIRROR] Fixes skateboard runtime
 2018-02-13 06:28:05 -06:00
LetterJay
8a957d64bf Merge pull request #5454 from Citadel-Station-13/upstream-merge-35576 
[MIRROR] Fixes blood contracts being unusable if the popup is cancelled
 2018-02-13 06:27:55 -06:00
CitadelStationBot
5b6c0d433f Automatic changelog generation for PR #5453 [ci skip] 2018-02-13 06:27:47 -06:00
LetterJay
4495bfa7b9 Merge pull request #5453 from Citadel-Station-13/upstream-merge-35354 
[MIRROR] Tritium now produces water vapor when combusting.
 2018-02-13 06:27:44 -06:00
CitadelStationBot
6039a77d5e Adds hooray emoji 2018-02-13 05:40:32 -06:00
Dax Dupont
789bf29661 Adds tada emoji (#35560) 2018-02-13 05:40:32 -06:00
CitadelStationBot
700cbe7fb1 Fixes skateboard runtime 2018-02-12 23:43:32 -06:00
ShizCalev
c45c1c17df Fixes scooter runtime 2018-02-12 23:43:32 -06:00
CitadelStationBot
4d12e598ac Fixes blood contracts being unusable if the popup is cancelled 2018-02-12 23:42:20 -06:00
YPO
e3e65a5237 Fixes blood contracts being unusable if the popup is cancelled 2018-02-12 23:42:19 -06:00
CitadelStationBot
1f02bfe662 Tritium now produces water vapor when combusting. 2018-02-12 21:11:22 -06:00
Buggy123
0c9bb1a249 Tritium now produces water vapor when combusting. (#35354) 
* HYDROGEN+OXYGEN=WATER

* Burning Tritium now produces a lot of radiation.

* Fixes check and line positions

* No longer spews absurd quantities of radiation.
 2018-02-12 21:11:22 -06:00
deathride58
3077f794cc Merge pull request #5450 from Citadel-Station-13/upstream-merge-35598 
[MIRROR] [s] fixes announcement system exploit
 2018-02-13 02:53:39 +00:00
CitadelStationBot
bb2761edb0 [s] fixes announcement system exploit 2018-02-12 19:33:28 -06:00
oranges
aa4b92faad Merge pull request #35598 from ShizCalev/announcement-exploit-fix 
[s] fixes announcement system exploit
 2018-02-12 19:33:28 -06:00
CitadelStationBot
dcbea24eee Automatic changelog generation for PR #5447 [ci skip] 2018-02-12 17:29:09 -06:00
deathride58
06b7f239c4 Merge pull request #5447 from Citadel-Station-13/upstream-merge-35433 
[MIRROR] Cult Update? Cult Update!
 2018-02-12 23:29:06 +00:00
deathride58
8b1a1e99ee Merge pull request #5449 from Citadel-Station-13/upstream-merge-35557 
[MIRROR] Fixes PDA virus runtime
 2018-02-12 23:24:45 +00:00
CitadelStationBot
ceb1113f31 Fixes PDA virus runtime 2018-02-12 16:32:07 -06:00