diff --git a/code/game/area/areas/edina.dm b/code/game/area/areas/edina.dm index 5a15eaff6d..66aae7b2ba 100644 --- a/code/game/area/areas/edina.dm +++ b/code/game/area/areas/edina.dm @@ -163,36 +163,6 @@ /area/edina/crew_quarters/store/pet name = "Pet Store" -/turf/open/floor/grass/snow/edina//But for now, we just handle what is outside, for light control etc. - name = "Scottish snow" - desc = "Looks super chilly!" - - light_range = 3 //MIDNIGHT BLUE - light_power = 0.15 //NOT PITCH BLACK, JUST REALLY DARK - light_color = "#00111a" //The light can technically cycle on a timer worldwide, but no daynight cycle. - baseturfs = /turf/open/floor/grass/snow/edina //If we explode or die somehow, we just make more! Ahahaha!!! - tiled_dirt = 0 //NO TILESMOOTHING DIRT/DIRT SPAWNS OR SOME SHIT - -//lets people build -/turf/open/floor/grass/snow/edina/attackby(obj/item/C, mob/user, params) - .=..() - if(istype(C, /obj/item/stack/tile)) - for(var/obj/O in src) - if(O.level == 1) //ex. pipes laid underneath a tile - for(var/M in O.buckled_mobs) - to_chat(user, "Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.") - return - var/obj/item/stack/tile/W = C - if(!W.use(1)) - return - var/turf/open/floor/T = PlaceOnTop(W.turf_type) - T.icon_state = initial(T.icon_state) - if(istype(W, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow - var/obj/item/stack/tile/light/L = W - var/turf/open/floor/light/F = T - F.state = L.state - playsound(src, 'sound/weapons/genhit.ogg', 50, 1) - ////////////////Mapping helper///////////////////////// /obj/effect/mapping_helpers/planet_z name = "planet z helper" diff --git a/modular_citadel/code/modules/festive/turfs.dm b/modular_citadel/code/modules/festive/turfs.dm index 0c6704b131..baf33cc696 100644 --- a/modular_citadel/code/modules/festive/turfs.dm +++ b/modular_citadel/code/modules/festive/turfs.dm @@ -1,5 +1,36 @@ //Turfy Turfs +/turf/open/floor/grass/snow/edina//But for now, we just handle what is outside, for light control etc. + name = "Scottish snow" + desc = "Looks super chilly!" + + light_range = 3 //MIDNIGHT BLUE + light_power = 0.15 //NOT PITCH BLACK, JUST REALLY DARK + light_color = "#00111a" //The light can technically cycle on a timer worldwide, but no daynight cycle. + baseturfs = /turf/open/floor/grass/snow/edina //If we explode or die somehow, we just make more! Ahahaha!!! + tiled_dirt = 0 //NO TILESMOOTHING DIRT/DIRT SPAWNS OR SOME SHIT + initial_gas_mix = OPENTURF_DEFAULT_ATMOS //DO NOT FREEZE EVERYONE TO DEATH ON CHRISTMAS + +//lets people build +/turf/open/floor/grass/snow/edina/attackby(obj/item/C, mob/user, params) + .=..() + if(istype(C, /obj/item/stack/tile)) + for(var/obj/O in src) + if(O.level == 1) //ex. pipes laid underneath a tile + for(var/M in O.buckled_mobs) + to_chat(user, "Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.") + return + var/obj/item/stack/tile/W = C + if(!W.use(1)) + return + var/turf/open/floor/T = PlaceOnTop(W.turf_type) + T.icon_state = initial(T.icon_state) + if(istype(W, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow + var/obj/item/stack/tile/light/L = W + var/turf/open/floor/light/F = T + F.state = L.state + playsound(src, 'sound/weapons/genhit.ogg', 50, 1) + /turf/open/floor/festive/cobblestone name = "cobblestone" baseturfs = /turf/open/floor/festive/cobblestone diff --git a/tgstation.dme b/tgstation.dme index ea997a3dbe..6b58f711bf 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1913,8 +1913,8 @@ #include "code\modules\buildmode\submodes\boom.dm" #include "code\modules\buildmode\submodes\copy.dm" #include "code\modules\buildmode\submodes\fill.dm" -#include "code\modules\buildmode\submodes\save_area.dm" #include "code\modules\buildmode\submodes\mapgen.dm" +#include "code\modules\buildmode\submodes\save_area.dm" #include "code\modules\buildmode\submodes\throwing.dm" #include "code\modules\buildmode\submodes\variable_edit.dm" #include "code\modules\cargo\bounty.dm" @@ -2459,9 +2459,9 @@ #include "code\modules\mafia\_defines.dm" #include "code\modules\mafia\controller.dm" #include "code\modules\mafia\map_pieces.dm" -#include "code\modules\mapexporting\mapexporter.dm" #include "code\modules\mafia\outfits.dm" #include "code\modules\mafia\roles.dm" +#include "code\modules\mapexporting\mapexporter.dm" #include "code\modules\mapping\map_config.dm" #include "code\modules\mapping\map_orientation_pattern.dm" #include "code\modules\mapping\map_template.dm"