12/21 modernizations from TG live (#103)
* sync (#3) * shuttle auto call * Merge /vore into /master (#39) * progress * Compile errors fixed No idea if it's test worthy tho as conflicts with race overhaul and narky removal. * Update admins.txt * efforts continue Fuck grab code, seriously * grab code is cancer * Execute the Narkism Do not hesitate. Show no mercy. * holy shit grab code is awful * have I bitched about grab code My bitching, let me show you it * código de agarre es una mierda No really it is * yeah I don't even know anymore. * Lolnope. Fuck grab code * I'm not even sure what to fix anymore * Self eating is not an acceptable fate * Taste the void, son. * My code doesn't pass it's own sanity check. Maybe it's a sign of things to come. * uncommented and notes * It Works and I Don't Know Why (#38) * shuttle auto call * it works and I don't know why * Subsystem 12/21 Most Recent TG subsystem folder * globalvars 12/21 Tossed out the flavor_misc and parallax files * Onclick 12/21 as well as .dme updates * _defines 12/21 ommited old _MC.dm * _HELPERS 12/21 Preserved snowflake placement of furry sprites * _defeines/genetics reapplied narkism holdover for snowflake races. * Oops forgot mutant colors * modules porting 12/21 + Sounds/icons Admin, Client and most of mob life files ommitted * enviroment file * Admin optimizations ahelp log system kept * Mob ports 12/21 Flavor text preserved * datums ported 12/21 * Game ported 12/21 * batch of duplicate fixes/dogborg work Dogborgs need to be modernized to refractored borg standards. * moar fixes * Maps and futher compile fixes
This commit is contained in:
@@ -1,74 +1,57 @@
|
||||
/*Cabin areas*/
|
||||
/area/awaymission/snowforest
|
||||
name = "Snow Forest"
|
||||
icon_state = "away"
|
||||
requires_power = 0
|
||||
luminosity = 1
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
|
||||
|
||||
/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"
|
||||
/obj/structure/firepit
|
||||
name = "firepit"
|
||||
desc = "warm and toasty"
|
||||
icon = 'icons/obj/stationobjs.dmi'
|
||||
icon_state = "fireplace-active"
|
||||
icon = 'icons/obj/fireplace.dmi'
|
||||
icon_state = "firepit-active"
|
||||
density = 0
|
||||
var/active = 1
|
||||
|
||||
/obj/structure/fireplace/initialize()
|
||||
/obj/structure/firepit/initialize()
|
||||
..()
|
||||
toggleFireplace()
|
||||
toggleFirepit()
|
||||
|
||||
/obj/structure/fireplace/attack_hand(mob/living/user)
|
||||
/obj/structure/firepit/attack_hand(mob/living/user)
|
||||
if(active)
|
||||
active = 0
|
||||
toggleFireplace()
|
||||
toggleFirepit()
|
||||
else
|
||||
..()
|
||||
|
||||
|
||||
/obj/structure/fireplace/attackby(obj/item/W,mob/living/user,params)
|
||||
/obj/structure/firepit/attackby(obj/item/W,mob/living/user,params)
|
||||
if(!active)
|
||||
if(W.is_hot())
|
||||
active = 1
|
||||
toggleFireplace()
|
||||
var/msg = W.ignition_effect(src, user)
|
||||
if(msg)
|
||||
active = TRUE
|
||||
visible_message(msg)
|
||||
toggleFirepit()
|
||||
else
|
||||
return ..()
|
||||
else
|
||||
W.fire_act()
|
||||
|
||||
/obj/structure/fireplace/proc/toggleFireplace()
|
||||
/obj/structure/firepit/proc/toggleFirepit()
|
||||
if(active)
|
||||
set_light(8)
|
||||
icon_state = "fireplace-active"
|
||||
SetLuminosity(8)
|
||||
icon_state = "firepit-active"
|
||||
else
|
||||
set_light(0)
|
||||
icon_state = "fireplace"
|
||||
SetLuminosity(0)
|
||||
icon_state = "firepit"
|
||||
|
||||
/obj/structure/fireplace/extinguish()
|
||||
/obj/structure/firepit/extinguish()
|
||||
if(active)
|
||||
active = 0
|
||||
toggleFireplace()
|
||||
active = FALSE
|
||||
toggleFirepit()
|
||||
|
||||
/obj/structure/fireplace/fire_act()
|
||||
/obj/structure/firepit/fire_act(exposed_temperature, exposed_volume)
|
||||
if(!active)
|
||||
active = 1
|
||||
toggleFireplace()
|
||||
active = TRUE
|
||||
toggleFirepit()
|
||||
|
||||
|
||||
|
||||
//other Cabin Stuff//
|
||||
|
||||
/obj/machinery/recycler/lumbermill
|
||||
name = "lumbermill saw"
|
||||
@@ -96,7 +79,8 @@
|
||||
|
||||
/*Cabin's forest*/
|
||||
/datum/mapGenerator/snowy
|
||||
modules = list(/datum/mapGeneratorModule/snow/pineTrees, \
|
||||
modules = list(/datum/mapGeneratorModule/bottomlayer/snow, \
|
||||
/datum/mapGeneratorModule/snow/pineTrees, \
|
||||
/datum/mapGeneratorModule/snow/deadTrees, \
|
||||
/datum/mapGeneratorModule/snow/randBushes, \
|
||||
/datum/mapGeneratorModule/snow/randIceRocks, \
|
||||
@@ -106,6 +90,9 @@
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user