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

11251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay 91c584fc22 Merge pull request #4640 from Citadel-Station-13/upstream-merge-34037 
[MIRROR] Fixes vent angles and on-ground item icons
 2018-01-03 04:57:24 -06:00
LetterJay b6a8902e01 Merge pull request #4639 from Citadel-Station-13/upstream-merge-34032 
[MIRROR] Unsquishes job ban panel
 2018-01-03 04:57:12 -06:00
CitadelStationBot 582e063c7c Automatic changelog generation for PR #4603 [ci skip] 2018-01-03 04:56:57 -06:00
LetterJay 6d1095a3cb Merge pull request #4603 from Citadel-Station-13/upstream-merge-33917 
[MIRROR] Always use the area name when selecting a teleport beacon
 2018-01-03 04:56:55 -06:00
CitadelStationBot cf35644ff8 Automatic changelog generation for PR #4426 [ci skip] 2018-01-03 04:56:41 -06:00
LetterJay ae8ae2969c Merge pull request #4426 from Citadel-Station-13/upstream-merge-33601 
[MIRROR] Fixes cross comms
 2018-01-03 04:56:38 -06:00
CitadelStationBot 035e334e5d Fixes vent angles and on-ground item icons 2018-01-02 20:10:38 -06:00
ShizCalev bf8e27e4f3 Fixes vent angles and inworld item icons 2018-01-02 20:10:38 -06:00
CitadelStationBot 1739e57999 Unsquishes job ban panel 2018-01-02 20:10:30 -06:00
Dax Dupont 417e3d801e Unsquishes job ban panel 2018-01-02 20:10:30 -06:00
LetterJay d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 
[MIRROR] Makes the decal component handle updating inventory icons
 2018-01-02 19:15:46 -06:00
CitadelStationBot c43a7b33e1 Automatic changelog generation for PR #4637 [ci skip] 2018-01-02 19:15:25 -06:00
LetterJay fc4e56201c Merge pull request #4637 from Citadel-Station-13/upstream-merge-33986 
[MIRROR] Makes some virology symptoms more worth using
 2018-01-02 19:15:22 -06:00
LetterJay 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
LetterJay 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
LetterJay 4dcc65a6bc Merge branch 'master' into upstream-merge-33917 2018-01-02 17:14:53 -06:00
CitadelStationBot 871da8f331 Automatic changelog generation for PR #4635 [ci skip] 2018-01-02 17:13:33 -06:00
LetterJay 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
LetterJay c22e0dc862 Update chameleon.dm 2018-01-02 15:48:32 -06:00
LetterJay 36cbe323cd Update vision.dm 2018-01-02 15:48:09 -06:00
LetterJay 2720b29908 Update sensory.dm 2018-01-02 15:47:56 -06:00
CitadelStationBot 10bb4f71ec Automatic changelog generation for PR #4636 [ci skip] 2018-01-02 15:47:04 -06:00
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
Emmett Gaines f581b2d94d Makes the decal component handle updating inventory icons 2018-01-02 15:18:31 -06:00
XDTM 84e0f7b7f3 Makes some virology symptoms more worth using 2018-01-02 15:15:17 -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
LetterJay 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 Dupont 6c606654c3 Removes icky ocky from the vault (#34021) 2018-01-02 13:31:28 -06:00
XDTM 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 Dupont 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
LetterJay 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
LetterJay 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
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