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

7510 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Dax Dupont 0ebd16f509 Solar control fixes (#33985) 
* Solar fixes

* Also removing the solcon-o icon
 2018-01-02 08:21:16 -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 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 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
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 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
oranges 18f5e1095a Merge pull request #34035 from ninjanomnom/actually-changeturf 
Puts back the changeturf part of PlaceOnTop()
 2018-01-02 00:12:32 -06: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 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
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 7d4a51f659 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463 2018-01-01 04:36:29 -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
LetterJay 7078a7ea49 Merge pull request #4598 from cebutris/cebusoap2 
adds functional cebusoap
 2018-01-01 04:26:03 -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 515092bd1c Merge branch 'master' into upstream-merge-33919 2018-01-01 04:11:29 -06:00
LetterJay 07adb3fdd6 Update teleporter.dm 2018-01-01 04:06:33 -06:00
LetterJay 4899131230 Update teleporter.dm 2018-01-01 04:06:14 -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