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

248 Commits

Author SHA1 Message Date
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
Jordan Brown
f0b02fac56 Merge pull request #34501 from AutomaticFrenzy/patch/mapping-scrubbers 
Allow mapping non-default scrubbers
 2018-01-19 09:38:04 -06:00
Jordan Brown
9df836baca Merge pull request #34479 from F-OS/patch-5 
newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
 2018-01-16 08:29:24 -06:00
ShizCalev
8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
Leo
ba1f61cb9e Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime 
Fix RPD runtimes and offsets of layered connector ports
 2018-01-13 08:58:44 -06:00
Leo
e11e4b3385 Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar 
Fix description of relabelled canisters
 2018-01-12 07:03:20 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
406df3ae92 Merge pull request #4709 from Citadel-Station-13/upstream-merge-34076 
[MIRROR] Fixes diagonal movement in pipes
 2018-01-08 04:18:06 +00:00
Emmett Gaines
65afc4d2b2 fixes diagonal movement in pipes (#34076) 2018-01-07 20:34:18 -06:00
Jordan Brown
1e4a6dd26b Merge pull request #34118 from MrStonedOne/patch-459 
Reduces the memory footprint of the gas_mixture datum
 2018-01-07 19:58:35 -06:00
deathride58
85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
ShizCalev
7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
Leo
fdfa61c1c8 Merge pull request #34107 from ShizCalev/canister-sprite 
Fixes relabeled canisters reverting sprites when broken
 2018-01-06 08:51:32 -06:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay
dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
LetterJay
35574263b1 Update outlet_injector.dm 2017-12-30 13:23:02 -06:00
LetterJay
70fea88a39 Update cryo.dm 2017-12-30 13:22:54 -06:00
LetterJay
95714a0207 Update volume_pump.dm 2017-12-30 13:22:46 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
YPOQ
a41a508475 Fixes air alarm contaminated mode (#33899) 
* Fixes air alarm contaminated mode

* set_filters, paths instead of ids

* Readds gasid2path call
 2017-12-29 02:57:42 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
deathride58
b4321a1dbe Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636 
[MIRROR] restores reaction max_reqs checking code
 2017-12-21 03:44:57 +00:00
deathride58
59947b4b3b Merge pull request #4424 from Citadel-Station-13/upstream-merge-33632 
[MIRROR] properly disables fusion
 2017-12-21 03:43:30 +00:00
oranges
d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
duncathan salt
0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
Jordan Brown
50bd078b43 Merge pull request #33636 from duncathan/max_reqs 
restores reaction max_reqs checking code
 2017-12-18 15:15:09 -06:00
LetterJay
28dfbc7ccc Update volume_pump.dm 2017-12-17 15:57:46 -06:00
LetterJay
2771fe55e4 Update pump.dm 2017-12-17 15:57:33 -06:00
duncathan salt
3d375e0be9 properly disables fusion (#33632) 2017-12-17 14:37:58 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
Jordan Brown
7a90baa1f8 Merge pull request #33390 from duncathan/atmos-defines 
cleans up atmos defines
 2017-12-09 15:53:34 -06:00
deathride58
2275d59305 Merge pull request #4276 from Citadel-Station-13/upstream-merge-33359 
[MIRROR] Fixes air alarm gas thresholds being impossible to change
 2017-12-08 18:46:33 +00:00
ACCount
7aac99d4d7 Fixes air alarm gas thresholds being impossible to change (#33359) 2017-12-08 12:08:24 -06:00
duncathan salt
623a105169 hopefully optimizes process_cell() a touch (#33329) 
* hopeful optimizations + code cleanup to process_cell() and lindaturftile

* minor fixes

* break and right paren

* extraneous define
 2017-12-08 12:07:14 -06:00
ACCount
435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
ACCount
d883ec3114 Moves pipe meter sprites (#33122) 2017-11-28 06:28:31 -06:00
kevinz000
606f403c5b Fixes cryo rotation (#32992) 2017-11-25 13:27:38 -06:00
deathride58
14ce7c8118 Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994 
[MIRROR] Updates some item drops to use drop_location()
 2017-11-25 05:53:16 +00:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
ShizCalev
12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
a8783e5d1f Merge branch 'master' into upstream-merge-32823 2017-11-18 06:06:14 +00:00
deathride58
5f055aa492 Update vent_scrubber.dm 2017-11-18 00:36:11 -05:00