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

4309 Commits

Author SHA1 Message Date
deathride58 6dc4584401 Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033 
[MIRROR] Fix mimes being able to laugh audibly
 2018-01-03 18:54:12 +00:00
deathride58 64b5feae78 Merge pull request #4642 from Citadel-Station-13/upstream-merge-34038 
[MIRROR] Fixes text pad window title
 2018-01-03 18:53:51 +00:00
Leo c1623792c9 Merge pull request #34033 from AutomaticFrenzy/patch/mime-laugh 
Fix mimes being able to laugh audibly
 2018-01-03 07:36:43 -06:00
Leo 832b1d95df Merge pull request #34038 from ShizCalev/text-pad 
Fixes text pad window title
 2018-01-03 07:35:17 -06:00
ShizCalev c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -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
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 3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -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 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
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
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 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 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 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 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 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 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 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
Jordan Brown 159fe41ab8 Merge pull request #33948 from ShizCalev/abstract-frying 
stops frying abstract or nodrop items
 2017-12-31 10:01:38 -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
AnturK bbca0afa37 Fixes thermals, also drops the see invisible from thermals. (#33950) 2017-12-31 06:30:34 -06:00
LetterJay 34b4976c28 Merge pull request #4614 from Citadel-Station-13/upstream-merge-33949 
[MIRROR] Makes it clear that command reports are IC.
 2017-12-31 02:53:22 -06:00
LetterJay 7998f037bd Merge pull request #4609 from Citadel-Station-13/upstream-merge-33580 
[MIRROR] Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-31 02:51:44 -06:00
LetterJay 503f8e2635 Merge pull request #4605 from Citadel-Station-13/upstream-merge-33805 
[MIRROR] Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
 2017-12-31 02:50:21 -06:00
LetterJay 8f2aab0908 Merge pull request #4595 from Citadel-Station-13/upstream-merge-33930 
[MIRROR] Fixes assistants spawning naked
 2017-12-31 02:50:00 -06:00
BeeSting12 7dac76651e Makes it clear that command reports are IC. (#33949) 
* fixes #33936

* sticky's idea was better
 2017-12-31 02:28:25 -06:00
oranges 3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing 
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-30 16:59:07 -06:00
Jordan Brown 3802cf8586 Merge pull request #33805 from Cruix/shuttle_machines 
Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
 2017-12-30 13:56:43 -06:00
LetterJay 211f3942a6 Merge branch 'master' into upstream-merge-33930 2017-12-30 13:37:52 -06:00
LetterJay c1c67ced1a Update color.dm 2017-12-30 13:37:30 -06:00
LetterJay 4d3b7ddcbd Update color.dm 2017-12-30 13:37:23 -06:00
LetterJay 32291c247b Update megafauna.dm 2017-12-30 13:33:45 -06:00
LetterJay 2994b4b7c2 Update blood_drunk_miner.dm 2017-12-30 13:33:37 -06:00
LetterJay 449ae34621 Update hostile.dm 2017-12-30 13:33:25 -06:00
LetterJay 96358f62f2 Update aux_base.dm 2017-12-30 13:33:15 -06:00
LetterJay 10643a192e Update vent_clog.dm 2017-12-30 13:33:01 -06:00
LetterJay de10a5b223 Update spider_infestation.dm 2017-12-30 13:32:53 -06:00
LetterJay f698fd5329 Update disease_outbreak.dm 2017-12-30 13:32:46 -06:00