shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,229 Commits 5 Branches 0 Tags
3a2deb1d4924b4e2a5066d881d54c4ee0a3b1ab6
Commit Graph
11229 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
CitadelStationBot 928e9e02ff Automatic changelog generation for PR #4601 [ci skip] 2018-01-02 18:13:45 -06:00
LetterJayandGitHub 706556df69 Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919 
[MIRROR] turfs changed to /space/basic are instead turned into /space
 2018-01-02 18:13:42 -06:00
CitadelStationBot 871da8f331 Automatic changelog generation for PR #4635 [ci skip] 2018-01-02 17:13:33 -06:00
LetterJayandGitHub 590775ddbe Merge pull request #4635 from Citadel-Station-13/upstream-merge-34003 
[MIRROR] Fixes Abyssal Gaze blinding forever
 2018-01-02 17:13:31 -06:00
CitadelStationBot 10bb4f71ec Automatic changelog generation for PR #4636 [ci skip] 2018-01-02 15:47:04 -06:00
LetterJayandGitHub 6b1f18d60c Merge pull request #4636 from Citadel-Station-13/upstream-merge-34021 
[MIRROR] Fixes ocky icky in the bank vault
 2018-01-02 15:47:01 -06:00
LetterJayandGitHub 4adbd0fbf4 Update construct_spells.dm 2018-01-02 15:46:51 -06:00
CitadelStationBot a525c16018 Automatic changelog generation for PR #4634 [ci skip] 2018-01-02 15:46:37 -06:00
LetterJayandGitHub c914f14339 Merge pull request #4634 from Citadel-Station-13/upstream-merge-33985 
[MIRROR] Solar control fixes
 2018-01-02 15:46:35 -06:00
CitadelStationBot 147bc88ff9 Automatic changelog generation for PR #4632 [ci skip] 2018-01-02 15:46:20 -06:00
LetterJayandGitHub 467578788f Merge pull request #4632 from Citadel-Station-13/upstream-merge-33983 
[MIRROR] Adds goonbee and cult, plus improves several emojis.
 2018-01-02 15:46:18 -06:00
LetterJayandGitHub ae8b59937b Merge pull request #4629 from Citadel-Station-13/upstream-merge-33987 
[MIRROR] Removes some periods from contributing.md
 2018-01-02 15:45:58 -06:00
LetterJayandGitHub a761e123ac Merge pull request #4624 from Citadel-Station-13/upstream-merge-33964 
[MIRROR] Adds a note on config changes to CONTRIBUTING
 2018-01-02 15:44:41 -06:00
LetterJayandGitHub b80c0c08ba Merge pull request #4621 from Citadel-Station-13/upstream-merge-33948 
[MIRROR] stops frying abstract or nodrop items
 2018-01-02 15:44:26 -06:00
LetterJayandGitHub 5030b1b7d4 Merge pull request #4593 from Citadel-Station-13/upstream-merge-33829 
[MIRROR] Replace explicit z-level checks with defines
 2018-01-02 15:40:52 -06:00
LetterJay dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/game/gamemodes/blob/overmind.dm
 2018-01-02 14:58:09 -06:00
LetterJayandGitHub 943388d8f4 Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463 
[MIRROR] Adds blob roundend report.
 2018-01-02 14:56:12 -06:00
CitadelStationBot bdf78648f6 Fixes ocky icky in the bank vault 2018-01-02 13:31:28 -06:00
Dax DupontandCitadelStationBot 6c606654c3 Removes icky ocky from the vault (#34021) 2018-01-02 13:31:28 -06:00
XDTMandCitadelStationBot bae882bf46 Fixes Abyssal Gaze blinding forever 2018-01-02 08:22:32 -06:00
CitadelStationBot d342303ef9 Solar control fixes 2018-01-02 08:21:16 -06:00
Dax DupontandCitadelStationBot 0ebd16f509 Solar control fixes (#33985) 
* Solar fixes

* Also removing the solcon-o icon
 2018-01-02 08:21:16 -06:00
CitadelStationBot bf35f19aca Automatic changelog generation for PR #4633 [ci skip] 2018-01-02 08:02:05 -06:00
LetterJayandGitHub b3eb85cdd2 Merge pull request #4633 from Citadel-Station-13/upstream-merge-34035 
[MIRROR] Puts back the changeturf part of PlaceOnTop()
 2018-01-02 08:02:02 -06:00
LetterJayandGitHub d035f16aca Update basilisk.dm 2018-01-02 05:24:47 -06:00
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
LetterJayandGitHub 3fafbe8bc5 Merge branch 'master' into upstream-merge-33829 2018-01-02 04:55:07 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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 95e51de1c0 Puts back the changeturf part of PlaceOnTop() 2018-01-02 00:12:32 -06:00
orangesandCitadelStationBot 18f5e1095a Merge pull request #34035 from ninjanomnom/actually-changeturf 
Puts back the changeturf part of PlaceOnTop()
 2018-01-02 00:12:32 -06:00
CitadelStationBot 85da6fbcef Adds goonbee and cult, plus improves several emojis. 2018-01-01 23:17:33 -06:00
FrozenGuy5andCitadelStationBot 3144b97ae4 Adds goonbee and cult plus improves several emojis. (#33983) 
-Adds :goon:
-Adds :cult:
-Improves ⚙️
-Improves 🎩
 2018-01-01 23:17:33 -06:00
CitadelStationBot 946bba6b98 Automatic changelog generation for PR #4628 [ci skip] 2018-01-01 21:34:29 -06:00
deathride58andGitHub f114380ad2 Merge pull request #4628 from deathride58/fIXESVOREFORREALTHISTIME 
ACTUALLY FIXES VORE
 2018-01-02 03:34:26 +00:00
CitadelStationBot e464f94187 Removes some periods from contributing.md 2018-01-01 20:46:43 -06:00
FrozenGuy5andCitadelStationBot bed61a6676 removes some dots (#33987) 2018-01-01 20:46:43 -06: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
LetterJayandGitHub 3ee2569379 Update borer_event.dm 2018-01-01 14:07:17 -06:00
LetterJayandGitHub 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