shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,186 Commits 5 Branches 0 Tags
d13d76ad71d51be528b2ecbf7113ffd6f4da53cd
Commit Graph

11186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay d13d76ad71 Merge branch 'upstream-merge-33829' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:17:29 -06:00
LetterJay f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay 3fafbe8bc5 Merge branch 'master' into upstream-merge-33829 2018-01-02 04:55:07 -06:00
LetterJay b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
CitadelStationBot c5a70ff34c Automatic changelog generation for PR #4430 [ci skip] 2018-01-02 04:52:40 -06:00
LetterJay 685bac498f Merge pull request #4430 from Citadel-Station-13/upstream-merge-33574 
[MIRROR] Advanced mob laziness
 2018-01-02 04:52:38 -06:00
LetterJay f786a90bad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 
# Conflicts:
#	code/controllers/subsystem/idlenpcpool.dm
 2018-01-02 04:37:36 -06:00
LetterJay e395cded9d cl 2018-01-02 04:34:21 -06:00
LetterJay c9482653f1 Merge pull request #4395 from Citadel-Station-13/upstream-merge-33537 
[MIRROR] Defines all subsystem priority values
 2018-01-02 04:21:05 -06:00
CitadelStationBot 946bba6b98 Automatic changelog generation for PR #4628 [ci skip] 2018-01-01 21:34:29 -06:00
deathride58 f114380ad2 Merge pull request #4628 from deathride58/fIXESVOREFORREALTHISTIME 
ACTUALLY FIXES VORE
 2018-01-02 03:34:26 +00:00
deathride58 04f19ea53d ACTUALLY FIXES VORE 2018-01-01 20:18:43 -05:00
LetterJay 9ede14fbce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 2018-01-01 14:14:06 -06:00
LetterJay 30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay 3ee2569379 Update borer_event.dm 2018-01-01 14:07:17 -06:00
LetterJay c2fb9ed729 Merge pull request #4573 from Citadel-Station-13/upstream-merge-33660 
[MIRROR] Adds roundend nuke disk location tracking to feedback.
 2018-01-01 11:19:01 -06:00
LetterJay ea3652c30e fuk 2018-01-01 11:07:40 -06:00
LetterJay c2b23984ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33660 2018-01-01 10:59:13 -06:00
CitadelStationBot 73537f2951 Automatic changelog generation for PR #4555 [ci skip] 2018-01-01 07:40:00 -06:00
LetterJay 4549ac7db2 Merge pull request #4555 from Citadel-Station-13/upstream-merge-32311 
[MIRROR] [READY]Component Forensics and Item Blood OverlayS!
 2018-01-01 07:39:58 -06:00
LetterJay 5486f71010 woo 2018-01-01 07:30:50 -06:00
LetterJay 168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay 6c147c9ef3 Merge branch 'master' into upstream-merge-33660 2018-01-01 04:59:20 -06:00
LetterJay 6bafa75ee8 Merge pull request #4626 from Citadel-Station-13/upstream-merge-33965 
[MIRROR] Autotag .github => GitHub
 2018-01-01 04:58:01 -06:00
LetterJay cd3f399924 Merge pull request #4619 from Citadel-Station-13/upstream-merge-33954 
[MIRROR] fixes component's dupe
 2018-01-01 04:27:20 -06:00
LetterJay d986ca1ee3 Merge pull request #4594 from Citadel-Station-13/upstream-merge-33911 
[MIRROR] Adds white and rainbow gloves to the gloves/color/random selection pool
 2018-01-01 04:26:56 -06:00
CitadelStationBot 0fbe251dfe Automatic changelog generation for PR #4599 [ci skip] 2018-01-01 04:26:36 -06:00
LetterJay dd0a5c9d24 Merge pull request #4599 from cebutris/guardianstuff 
blacklists holoparasites from discounting
 2018-01-01 04:26:34 -06:00
LetterJay 7078a7ea49 Merge pull request #4598 from cebutris/cebusoap2 
adds functional cebusoap
 2018-01-01 04:26:03 -06:00
CitadelStationBot a881de18b9 Automatic changelog generation for PR #4596 [ci skip] 2018-01-01 04:25:40 -06:00
LetterJay 1463a442a5 Merge pull request #4596 from Citadel-Station-13/upstream-merge-33915 
[MIRROR] Removes suit sensors from bural garbs
 2018-01-01 04:25:37 -06:00
LetterJay ce43797f03 Merge pull request #4602 from Citadel-Station-13/upstream-merge-33918 
[MIRROR] Changed BYOND Link to Secure HTTPS
 2018-01-01 04:11:00 -06:00
CitadelStationBot c79b75687d Autotag .github => GitHub 2018-01-01 04:01:33 -06:00
Jordan Brown 2c350fcb6c Autotag .github => GitHub (#33965) 2018-01-01 04:01:33 -06:00
LetterJay 3a8f27a2bf Merge pull request #4623 from Citadel-Station-13/upstream-merge-33960 
[MIRROR] Corrects flamethrower capitalization
 2017-12-31 15:23:14 -06:00
LetterJay 8369a3886d Merge pull request #4622 from Citadel-Station-13/upstream-merge-33957 
[MIRROR] cleans up some behaviour for PlaceOnTop/Bottom
 2017-12-31 15:22:55 -06:00
LetterJay 2db4000f08 Merge pull request #4618 from Citadel-Station-13/upstream-merge-33951 
[MIRROR] Fixes reset_perspective runtimes
 2017-12-31 15:22:25 -06:00
LetterJay d1febba415 Merge pull request #4616 from Citadel-Station-13/upstream-merge-33950 
[MIRROR] Fixes thermals, also drops the see invisible from thermals.
 2017-12-31 15:22:04 -06:00
CitadelStationBot 482e0c6fe5 Corrects flamethrower capitalization 2017-12-31 10:02:59 -06:00
Jordan Brown 54032f9c6d Merge pull request #33960 from ShizCalev/flamer 
Corrects flamethrower capitalization
 2017-12-31 10:02:59 -06:00
CitadelStationBot 922e360ed4 cleans up some behaviour for PlaceOnTop/Bottom 2017-12-31 10:01:46 -06:00
Jordan Brown 4e0efc64d5 Merge pull request #33957 from ninjanomnom/helper-cleanup 
cleans up some behaviour for PlaceOnTop/Bottom
 2017-12-31 10:01:46 -06:00
CitadelStationBot 05eb81b5c3 fixes component's dupe 2017-12-31 09:59:16 -06:00
Jordan Brown d0e5a38c29 Merge pull request #33954 from jammer312/components_fix 
fixes component's dupe
 2017-12-31 09:59:16 -06:00
CitadelStationBot 88f3e9f99f Fixes reset_perspective runtimes 2017-12-31 09:58:02 -06:00
Jordan Brown 19c35c63d6 Merge pull request #33951 from AnturK/perspective_fix 
Fixes reset_perspective runtimes
 2017-12-31 09:58:02 -06:00
LetterJay 806124e69b Merge pull request #4617 from Citadel-Station-13/revert-4611-upstream-merge-33940 
Revert "[MIRROR] Fix PDA message photos not being viewable"
 2017-12-31 06:58:39 -06:00
LetterJay 7a6cf002d3 Revert "[MIRROR] Fix PDA message photos not being viewable" 2017-12-31 06:41:03 -06:00
CitadelStationBot 0a007a754a Fixes thermals, also drops the see invisible from thermals. 2017-12-31 06:30:34 -06:00
AnturK bbca0afa37 Fixes thermals, also drops the see invisible from thermals. (#33950) 2017-12-31 06:30:34 -06:00