cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-11 16:08:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into maptick

Browse Source
This commit is contained in:
Archie
2021-04-30 00:40:43 -03:00
parent 9089d51bc1 eb551360c6
commit 0d37f3342b
12 changed files with 85 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space_Station_13_areas_gravity.dm
+11
View File
@@ -386,36 +386,47 @@
/area/solar/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/fore/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/aft/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/aux/port/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/aux/starboard/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/starboard/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/starboard/aft/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/starboard/fore/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/port/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/port/aft/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/solar/port/fore/gravity
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
//Solar Maint
code/game/area/areas/holodeck.dm
+1
View File
@@ -53,6 +53,7 @@
*/
/area/holodeck/rec_center
name = "\improper Recreational Holodeck"
has_gravity = STANDARD_GRAVITY
/area/holodeck/rec_center/offline
name = "Holodeck - Offline"
code/game/objects/structures/flora.dm
+2 -2
View File
@@ -694,7 +694,7 @@
. = ..()
/obj/structure/flora/crystal/medium
name = "small crystals"
name = "medium crystals"
icon = 'icons/obj/flora/layeniamedium.dmi'
pixel_x = -16
pixel_y = -3
@@ -705,7 +705,7 @@
//Medium crystal growths
/obj/structure/flora/crystal/medium/growth
name = "small crystals"
name = "medium crystals"
desc = "A growth of medium crystals"
icon_state = "crystalgrowth"
code/game/turfs/open.dm
+7
View File
@@ -242,6 +242,13 @@
//testing("Active turf found. Return value of compare(): [is_active]")
excited = TRUE
SSair.active_turfs |= src
//Issues with air runtiming and you don't know where? Uncomment the following code.
/*
if(air == null)
log_game("Bad air from [src] at [src.loc]")
if(enemy_air == null)
log_game("Bad air from [enemy_tile] at [enemy_tile.loc]")
*/
/turf/open/proc/GetHeatCapacity()
. = air.heat_capacity()
code/game/turfs/simulated/floor/plating/asteroid.dm
+2 -4
View File
@@ -388,17 +388,15 @@
//light_color = LIGHT_COLOR_WHITE
/turf/open/floor/plating/asteroid/layenia/Initialize()
. = ..()
if(prob(50))
icon_state = "layenia[rand(0,4)]"
set_layenia_light(src)
/turf/open/floor/plating/asteroid/layenia/garden
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
planetary_atmos = TRUE
/turf/open/floor/plating/asteroid/layenia/Initialize()
. = ..()
set_layenia_light(src)
/proc/set_layenia_light(turf/open/floor/B)
switch(B.icon_state)
if("layenia3", "layenia4")
code/game/turfs/simulated/minerals.dm
+1 -1
View File
@@ -527,9 +527,9 @@
/turf/closed/mineral/layenia
name = "Crimson rock"
icon = 'icons/turf/mining.dmi'
smooth_icon = 'icons/turf/layeniarocks.dmi'
icon_state = "layenia"
smooth = SMOOTH_MORE|SMOOTH_BORDER
smooth_icon = 'icons/turf/layeniarocks.dmi'
canSmoothWith = null
baseturfs = /turf/open/floor/plating/asteroid/layenia
initial_gas_mix = FROZEN_ATMOS