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

12915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
d5a9dd87d7 Redone Coffin Icons (Dikembe Mutombo Edition) 2018-01-31 01:52:40 -06:00
Jittai
7dde4815ca Redone Coffin Icons (Dikembe Mutombo Edition) (#35127) 
* Coffins

* cleanup

* moar grain
 2018-01-31 01:52:40 -06:00
CitadelStationBot
306ec6859a Automatic changelog generation for PR #5200 [ci skip] 2018-01-30 23:17:12 -06:00
LetterJay
0d2b1db67c Merge pull request #5200 from improvedname/loudout-skirt 
Adds security skirts to the loadout
 2018-01-30 23:17:10 -06:00
LetterJay
5b948125ca Merge pull request #5199 from Vivinet/darkinterface 
Dark theme for the general interface
 2018-01-30 23:16:58 -06:00
CitadelStationBot
84cbaecb0f Automatic changelog generation for PR #5195 [ci skip] 2018-01-30 23:16:43 -06:00
LetterJay
d49a578463 Merge pull request #5195 from Citadel-Station-13/upstream-merge-35064 
[MIRROR] Fixes blood contract names
 2018-01-30 23:16:41 -06:00
CitadelStationBot
bc5e3917a5 Automatic changelog generation for PR #5192 [ci skip] 2018-01-30 23:16:24 -06:00
LetterJay
58da631638 Merge pull request #5192 from Citadel-Station-13/upstream-merge-34599 
[MIRROR] adds extendohands
 2018-01-30 23:16:22 -06:00
LetterJay
ce8114b291 Merge pull request #5185 from Citadel-Station-13/upstream-merge-35047 
[MIRROR] Fixes being able to bomb servant blockers
 2018-01-30 23:15:52 -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
Improvedname
3db7412fb7 adds loudout stuff... 2018-01-30 15:10:04 +01: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
Vivinet
b0c94deff3 Removed interface/skin.dmf from the tgstation.dme.dme. Added a new interface located in modular_citadel/interface/skin.dmf, this should be a one for one clone of the original interface skin.dmf with a darker tone. 2018-01-29 21:26:40 -08:00
CitadelStationBot
e5b34c80e2 Fixes blood contract names 2018-01-29 21:57:11 -06:00
Jordan Brown
bfd6f8b792 Fixes blood contract names (#35064) 2018-01-29 21:57:11 -06:00
CitadelStationBot
78df41fcf1 adds extendohands 2018-01-29 21:56:44 -06:00
PKPenguin321
e4dd53a89f adds extendohands (#34599) 
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
 2018-01-29 21:56:44 -06:00
CitadelStationBot
ad9a8b470c Fixes being able to bomb servant blockers 2018-01-29 21:55:38 -06:00
vuonojenmustaturska
5541395022 Merge pull request #35047 from ShizCalev/servant_blocker-bomb 
Fixes being able to bomb servant blockers
 2018-01-29 21:55:38 -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