shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/Cabin.dm
+47 -34
View File
@@ -1,57 +1,74 @@
/*Cabin areas*/
/area/awaymission/snowforest
name = "Snow Forest"
icon_state = "away"
requires_power = 0
luminosity = 1
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
/obj/structure/firepit
name = "firepit"
/area/awaymission/cabin
name = "Cabin"
icon_state = "away2"
requires_power = 1
luminosity = 0
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
/area/awaymission/snowforest/lumbermill
name = "Lumbermill"
icon_state = "away3"
/*Cabin code*/
/obj/structure/fireplace
name = "fireplace"
desc = "warm and toasty"
icon = 'icons/obj/fireplace.dmi'
icon_state = "firepit-active"
icon = 'icons/obj/stationobjs.dmi'
icon_state = "fireplace-active"
density = 0
var/active = 1
/obj/structure/firepit/initialize()
/obj/structure/fireplace/initialize()
..()
toggleFirepit()
toggleFireplace()
/obj/structure/firepit/attack_hand(mob/living/user)
/obj/structure/fireplace/attack_hand(mob/living/user)
if(active)
active = 0
toggleFirepit()
toggleFireplace()
else
..()
/obj/structure/firepit/attackby(obj/item/W,mob/living/user,params)
/obj/structure/fireplace/attackby(obj/item/W,mob/living/user,params)
if(!active)
var/msg = W.ignition_effect(src, user)
if(msg)
active = TRUE
visible_message(msg)
toggleFirepit()
if(W.is_hot())
active = 1
toggleFireplace()
else
return ..()
else
W.fire_act()
/obj/structure/firepit/proc/toggleFirepit()
/obj/structure/fireplace/proc/toggleFireplace()
if(active)
SetLuminosity(8)
icon_state = "firepit-active"
set_light(8)
icon_state = "fireplace-active"
else
SetLuminosity(0)
icon_state = "firepit"
set_light(0)
icon_state = "fireplace"
/obj/structure/firepit/extinguish()
/obj/structure/fireplace/extinguish()
if(active)
active = FALSE
toggleFirepit()
active = 0
toggleFireplace()
/obj/structure/firepit/fire_act(exposed_temperature, exposed_volume)
/obj/structure/fireplace/fire_act()
if(!active)
active = TRUE
toggleFirepit()
//other Cabin Stuff//
active = 1
toggleFireplace()
/obj/machinery/recycler/lumbermill
name = "lumbermill saw"
@@ -79,8 +96,7 @@
/*Cabin's forest*/
/datum/mapGenerator/snowy
modules = list(/datum/mapGeneratorModule/bottomlayer/snow, \
/datum/mapGeneratorModule/snow/pineTrees, \
modules = list(/datum/mapGeneratorModule/snow/pineTrees, \
/datum/mapGeneratorModule/snow/deadTrees, \
/datum/mapGeneratorModule/snow/randBushes, \
/datum/mapGeneratorModule/snow/randIceRocks, \
@@ -90,9 +106,6 @@
if(istype(T,/turf/open/floor/plating/asteroid/snow))
return ..(T)
return 0
/datum/mapGeneratorModule/bottomlayer/snow
spawnableTurfs = list(/turf/open/floor/plating/asteroid/snow/atmosphere = 100)
/datum/mapGeneratorModule/snow/pineTrees
spawnableAtoms = list(/obj/structure/flora/tree/pine = 30)