[MIRROR] Var cleanup and map fixes (#5359)

* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
This commit is contained in:
CitadelStationBot
2018-02-07 20:04:04 -06:00
committed by Poojawa
parent b476df25ca
commit 717da969a6
24 changed files with 177 additions and 687 deletions
-6
View File
@@ -64,12 +64,6 @@
material = WOOD
var/drop_amount = 3
/obj/structure/barricade/wooden/snowed
name = "crude plank barricade"
desc = "This space is blocked off by a wooden barricade. It seems to be covered in a layer of snow."
icon_state = "woodenbarricade-snow"
max_integrity = 125
/obj/structure/barricade/wooden/crude
name = "crude plank barricade"
desc = "This space is blocked off by a crude assortment of planks."
+5
View File
@@ -211,6 +211,11 @@
flags_1 = ON_BORDER_1
CanAtmosPass = ATMOS_PASS_PROC
/obj/machinery/door/firedoor/border_only/closed
icon_state = "door_closed"
opacity = TRUE
density = TRUE
/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && (mover.pass_flags & PASSGLASS))
return 1
@@ -17,6 +17,8 @@
/obj/structure/closet/crate/New()
..()
if(icon_state == "[initial(icon_state)]open")
opened = TRUE
update_icon()
/obj/structure/closet/crate/CanPass(atom/movable/mover, turf/target)
@@ -182,11 +182,11 @@
A.narsie_act()
/turf/open/floor/carpet/break_tile()
broken = 1
broken = TRUE
update_icon()
/turf/open/floor/carpet/burn_tile()
burnt = 1
burnt = TRUE
update_icon()
/turf/open/floor/carpet/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
@@ -290,16 +290,16 @@
flags_1 = NONE
planetary_atmos = TRUE
archdrops = list(/obj/item/stack/sheet/mineral/snow = 5)
burnt_states = list("snow_dug")
/turf/open/floor/plating/asteroid/snow/burn_tile()
var/flammened = FALSE
if(!flammened)
if(!burnt)
visible_message("<span class='danger'>[src] melts away!.</span>")
slowdown = 0
flammened = TRUE
burnt = TRUE
icon_state = "snow_dug"
else
return FALSE
return TRUE
return FALSE
/turf/open/floor/plating/asteroid/snow/ice
name = "icey snow"
@@ -149,6 +149,16 @@
//liquid plasma!!!!!!//
/turf/open/floor/plasteel/vault/snowdin
initial_gas_mix = "o2=22;n2=82;TEMP=180"
planetary_atmos = 1
temperature = 180
/turf/open/floor/plasteel/dark/snowdin
initial_gas_mix = "o2=22;n2=82;TEMP=180"
planetary_atmos = 1
temperature = 180
/turf/open/lava/plasma
name = "liquid plasma"
desc = "A flowing stream of chilled liquid plasma. You probably shouldn't get in."
@@ -540,6 +550,12 @@
//special items//--
/obj/structure/barricade/wooden/snowed
name = "crude plank barricade"
desc = "This space is blocked off by a wooden barricade. It seems to be covered in a layer of snow."
icon_state = "woodenbarricade-snow"
max_integrity = 125
/obj/item/clothing/under/syndicate/coldres
name = "insulated tactical turtleneck"
desc = "A non-descript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection."