shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,898 Commits 5 Branches 0 Tags
e292b050f8a413c3f643b20664f2ea3dcf6f4e21
Commit Graph

12898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liam e292b050f8 bye 2018-01-30 22:44:21 -06:00
CitadelStationBot f4c44d004a Automatic changelog generation for PR #5198 [ci skip] 2018-01-30 10:14:26 -06:00
CitadelStationBot f3c585935f [MIRROR] Typo fix in Bubblegum desc and outdated comment (#5198) 
* Merge pull request #35055 from 81Denton/hecking-typo

Typo fix in Bubblegum desc and outdated comment

* Typo fix in Bubblegum desc and outdated comment
 2018-01-30 10:14:23 -06:00
CitadelStationBot cb58800683 [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174) 
* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires
 2018-01-30 07:32:34 -06:00
CitadelStationBot 02b3e47fc3 [MIRROR] Cosmic Bedsheet (#5170) 
* adds cosmic space bedsheet

* Cosmic Bedsheet
 2018-01-30 07:31:26 -06:00
CitadelStationBot e5b8057f18 Automatic changelog generation for PR #5183 [ci skip] 2018-01-30 07:30:53 -06:00
CitadelStationBot eb9bfbcbb0 [MIRROR] Expand Cyborg (#5183) 
* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg
 2018-01-30 07:30:51 -06:00
CitadelStationBot a965828526 Automatic changelog generation for PR #5187 [ci skip] 2018-01-30 07:26:06 -06:00
CitadelStationBot c93df0ae55 [MIRROR] Makes fire colorful and anime (#5187) 
* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime
 2018-01-30 07:26:04 -06:00
CitadelStationBot 4cfcc77bd4 Automatic changelog generation for PR #5190 [ci skip] 2018-01-30 07:24:20 -06:00
CitadelStationBot 0b330482fc [MIRROR] New Coffin Sprite (#5190) 
* coffins have a new sprite (#34995)

* New Coffin Sprite
 2018-01-30 07:24:18 -06:00
CitadelStationBot fd97ae832c Automatic changelog generation for PR #5191 [ci skip] 2018-01-30 07:23:49 -06:00
CitadelStationBot 001dbde0c9 [MIRROR] Sexy Solar Sprites (#5191) 
* replaced solar panel sprites with better ones

* Sexy Solar Sprites
 2018-01-30 07:23:46 -06:00
CitadelStationBot 670bc6a929 [MIRROR] Better Chat Squashing (#5193) 
* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing
 2018-01-30 07:23:18 -06:00
CitadelStationBot 89fa4b0f28 Automatic changelog generation for PR #5167 [ci skip] 2018-01-28 20:31:29 -06:00
deathride58 6633aff679 Merge pull request #5167 from deathride58/shitcodepatch 
Cleans up useless ..()s in cit_screenshake.dm
 2018-01-29 02:31:27 +00:00
deathride58 3e2292ac1d Merge pull request #5166 from Cyberboss/patch-1 
Fixes the mapdiffbot issue
 2018-01-29 02:31:15 +00:00
CitadelStationBot db3eb413b9 Automatic changelog generation for PR #5163 [ci skip] 2018-01-28 20:31:04 -06:00
deathride58 5a08f15eb6 Merge pull request #5163 from Citadel-Station-13/upstream-merge-35029 
[MIRROR] The long dark blue line continues. (Adds academy to random station names.)
 2018-01-29 02:31:02 +00:00
CitadelStationBot d972aeeeab Automatic changelog generation for PR #5161 [ci skip] 2018-01-28 20:30:50 -06:00
deathride58 9dc6a9dacb Merge pull request #5161 from Citadel-Station-13/upstream-merge-34992 
[MIRROR] Microwave Powercrêpe
 2018-01-29 02:30:49 +00:00
deathride58 1e9e50fa03 Merge pull request #5160 from Citadel-Station-13/upstream-merge-34939 
[MIRROR] Increases Drone Speed
 2018-01-29 02:30:34 +00:00
deathride58 34b93a8d42 Merge pull request #5159 from Citadel-Station-13/upstream-merge-34926 
[MIRROR] Makes revenants spawn on dead bodies & bodycontainers
 2018-01-29 02:30:17 +00:00
CitadelStationBot 62462369ca Automatic changelog generation for PR #5157 [ci skip] 2018-01-28 20:29:20 -06:00
deathride58 7673583ce1 Merge pull request #5157 from Citadel-Station-13/upstream-merge-35025 
[MIRROR] Warp whistle now respects notransform
 2018-01-29 02:29:18 +00:00
deathride58 539621a846 Merge pull request #5127 from Citadel-Station-13/upstream-merge-34875 
[MIRROR] Removes overhead and fixes null runtime with NAMEOF
 2018-01-29 02:29:00 +00:00
deathride58 90cd07e798 Merge pull request #5109 from Citadel-Station-13/upstream-merge-34913 
[MIRROR] Fixes not being able to stop tail wagging
 2018-01-29 02:28:31 +00:00
CitadelStationBot 4f945ce78d Automatic changelog generation for PR #5118 [ci skip] 2018-01-28 20:28:09 -06:00
deathride58 28bd203f41 Merge pull request #5118 from Citadel-Station-13/supply-console-security 
Restricts Supply Console to Quatermaster access
 2018-01-29 02:28:07 +00:00
deathride58 ad15cbab33 cleans up ..() in cit_screenshake.dm 2018-01-28 21:22:28 -05:00
Jordan Brown 8261e15126 Fixes the mapdiffbot issue 2018-01-28 21:18:21 -05:00
CitadelStationBot d940f6e604 The long dark blue line continues. (Adds academy to random station names.) 2018-01-28 18:31:49 -06:00
F-OS bedfaffac9 The long dark blue line continues. (Adds academy to random station names.) (#35029) 
* Update station_names.txt

* oh

* Update station_names.txt
 2018-01-28 18:31:49 -06:00
CitadelStationBot fe57d0395f Microwave Powercrêpe 2018-01-28 18:29:28 -06:00
uraniummeltdown f868cb146f alt-click on microwave to cook (#34992) 2018-01-28 18:29:27 -06:00
CitadelStationBot 2e485706e7 Increases Drone Speed 2018-01-28 18:27:14 -06:00
Anonmare 1eae1971e3 Increases Drone Speed (#34939) 
* Increases Drone Speed

* Update _drone.dm

* I'm not changing it again
 2018-01-28 18:27:14 -06:00
CitadelStationBot 907117f275 Makes revenants spawn on dead bodies & bodycontainers 2018-01-28 18:03:41 -06:00
Jordan Brown b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant 
Makes revenants spawn on dead bodies & bodycontainers
 2018-01-28 18:03:41 -06:00
LetterJay 84be31bb00 Update unsorted.dm 2018-01-28 15:19:22 -06:00
LetterJay da5d277ddb Merge pull request #5156 from Citadel-Station-13/upstream-merge-34983 
[MIRROR] Removes /New() from landmarks
 2018-01-28 15:18:06 -06:00
LetterJay 81f55b49a5 Merge pull request #5155 from Citadel-Station-13/upstream-merge-35009 
[MIRROR] Changes up the Construction Area on Box slightly.
 2018-01-28 15:17:38 -06:00
LetterJay 244d721595 Merge pull request #5152 from Citadel-Station-13/upstream-merge-35050 
[MIRROR] Fixes CODEOWNERS conflict
 2018-01-28 15:17:26 -06:00
LetterJay 25e933f63f Update CODEOWNERS 2018-01-28 15:17:16 -06:00
CitadelStationBot de93392863 Automatic changelog generation for PR #5151 [ci skip] 2018-01-28 15:16:54 -06:00
LetterJay b690ac4af1 Merge pull request #5151 from Citadel-Station-13/upstream-merge-35018 
[MIRROR] Rice (pudding) is no longer a salad.
 2018-01-28 15:16:52 -06:00
LetterJay a05921f657 Merge pull request #5150 from Citadel-Station-13/upstream-merge-34982 
[MIRROR] Makes lighting corner optimization a little more sane
 2018-01-28 15:16:39 -06:00
LetterJay cc5c6ec9a3 Merge pull request #5149 from Citadel-Station-13/upstream-merge-34996 
[MIRROR] Fixes held_mob release runtime
 2018-01-28 15:16:28 -06:00
LetterJay bc4758d20e Merge pull request #5148 from Citadel-Station-13/upstream-merge-35016 
[MIRROR] Fixes possible issue with set_labels
 2018-01-28 15:16:15 -06:00
CitadelStationBot 002cdc17fe Automatic changelog generation for PR #5147 [ci skip] 2018-01-28 15:16:08 -06:00