Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate * Update miscellaneous.dm * Delete miscellaneous.dm.rej * Delete pet.dm.rej * Update pet.dm * Update species.dm * Update miscellaneous.dm * Update species.dm * Update miscellaneous.dm * Delete species.dm.rej * Update species.dm pretty sure I got all the indentation correct THIS time, ffs * Update species.dm * Update species.dm fucking tabs man, fucking tabs.
This commit is contained in:
committed by
Poojawa
parent
a8c4c86e1c
commit
a905c15dad
@@ -71,10 +71,8 @@
|
||||
/turf/closed/indestructible/fakeglass/Initialize()
|
||||
..()
|
||||
icon_state = null //set the icon state to null, so our base state isn't visible
|
||||
var/image/I = image('icons/obj/structures.dmi', loc = src, icon_state = "grille")
|
||||
underlays += I //add a grille underlay
|
||||
I = image('icons/turf/floors.dmi', loc = src, icon_state = "plating")
|
||||
underlays += I //add the plating underlay, below the grille
|
||||
underlays += mutable_appearance('icons/obj/structures.dmi', "grille") //add a grille underlay
|
||||
underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille
|
||||
|
||||
/turf/closed/indestructible/fakedoor
|
||||
name = "Centcom Access"
|
||||
|
||||
+11
-6
@@ -3,7 +3,7 @@
|
||||
|
||||
var/wet = 0
|
||||
var/wet_time = 0 // Time in seconds that this floor will be wet for.
|
||||
var/image/wet_overlay = null
|
||||
var/mutable_appearance/wet_overlay
|
||||
|
||||
/turf/open/indestructible
|
||||
name = "floor"
|
||||
@@ -183,17 +183,22 @@
|
||||
if(wet_setting != TURF_DRY)
|
||||
if(wet_overlay)
|
||||
cut_overlay(wet_overlay)
|
||||
wet_overlay = null
|
||||
else
|
||||
wet_overlay = mutable_appearance()
|
||||
var/turf/open/floor/F = src
|
||||
if(istype(F))
|
||||
if(wet_setting == TURF_WET_PERMAFROST)
|
||||
wet_overlay = image('icons/effects/water.dmi', src, "ice_floor")
|
||||
wet_overlay.icon = 'icons/effects/water.dmi'
|
||||
wet_overlay.icon_state = "ice_floor"
|
||||
else if(wet_setting == TURF_WET_ICE)
|
||||
wet_overlay = image('icons/turf/overlays.dmi', src, "snowfloor")
|
||||
wet_overlay.icon = 'icons/turf/overlays.dmi'
|
||||
wet_overlay.icon_state = "snowfloor"
|
||||
else
|
||||
wet_overlay = image('icons/effects/water.dmi', src, "wet_floor_static")
|
||||
wet_overlay.icon = 'icons/effects/water.dmi'
|
||||
wet_overlay.icon_state = "wet_floor_static"
|
||||
else
|
||||
wet_overlay = image('icons/effects/water.dmi', src, "wet_static")
|
||||
wet_overlay.icon = 'icons/effects/water.dmi'
|
||||
wet_overlay.icon_state = "wet_static"
|
||||
add_overlay(wet_overlay)
|
||||
HandleWet()
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
var/spread = 0 //will the seam spread?
|
||||
var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
|
||||
var/last_act = 0
|
||||
var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner
|
||||
var/scan_state = "" //Holder for the image we display when we're pinged by a mining scanner
|
||||
var/defer_change = 0
|
||||
|
||||
/turf/closed/mineral/Initialize()
|
||||
@@ -380,7 +380,7 @@
|
||||
var/stage = 0 //How far into the lifecycle of gibtonite we are, 0 is untouched, 1 is active and attempting to detonate, 2 is benign and ready for extraction
|
||||
var/activated_ckey = null //These are to track who triggered the gibtonite deposit for logging purposes
|
||||
var/activated_name = null
|
||||
var/activated_image = null
|
||||
var/mutable_appearance/activated_overlay
|
||||
|
||||
/turf/closed/mineral/gibtonite/Initialize()
|
||||
det_time = rand(8,10) //So you don't know exactly when the hot potato will explode
|
||||
@@ -394,9 +394,8 @@
|
||||
|
||||
/turf/closed/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0)
|
||||
if(stage == 0)
|
||||
var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_active", layer = ON_EDGED_TURF_LAYER)
|
||||
add_overlay(I)
|
||||
activated_image = I
|
||||
activated_overlay = mutable_appearance('icons/turf/smoothrocks.dmi', "rock_Gibtonite_active", ON_EDGED_TURF_LAYER)
|
||||
add_overlay(activated_overlay)
|
||||
name = "gibtonite deposit"
|
||||
desc = "An active gibtonite reserve. Run!"
|
||||
stage = 1
|
||||
@@ -433,9 +432,9 @@
|
||||
|
||||
/turf/closed/mineral/gibtonite/proc/defuse()
|
||||
if(stage == 1)
|
||||
cut_overlay(activated_image)
|
||||
var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_inactive", layer = ON_EDGED_TURF_LAYER)
|
||||
add_overlay(I)
|
||||
cut_overlay(activated_overlay)
|
||||
activated_overlay.icon_state = "rock_Gibtonite_inactive"
|
||||
add_overlay(activated_overlay)
|
||||
desc = "An inactive gibtonite reserve. The ore can be extracted."
|
||||
stage = 2
|
||||
if(det_time < 0)
|
||||
|
||||
Reference in New Issue
Block a user