diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index 7643266525a..d8ed74d229d 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_maps/map_files/generic/z2.dmm @@ -22,17 +22,9 @@ /turf/closed/indestructible/riveted, /area/space) "ag" = ( -/obj/structure/foamedmetal, -/obj/structure/window/reinforced/tinted{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/structure/window{ - icon_state = "rwindow"; - dir = 8 - }, -/turf/open/floor/holofloor/plating, -/area/holodeck/rec_center/bunker) +/obj/effect/holodeck_effect/mobspawner/bee, +/turf/open/floor/holofloor/asteroid, +/area/holodeck/rec_center/anthophila) "ah" = ( /obj/structure/foamedmetal, /obj/structure/window{ @@ -94,11 +86,7 @@ /turf/open/floor/holofloor/plating, /area/holodeck/rec_center/offline) "as" = ( -/turf/open/floor/holofloor{ - icon_state = "engine"; - name = "Burn-Mix Floor"; - initial_gas_mix = "o2=2500;plasma=5000;TEMP=370" - }, +/turf/open/floor/holofloor/plating/burnmix, /area/holodeck/rec_center/burn) "at" = ( /turf/open/floor/holofloor{ @@ -150,11 +138,7 @@ /area/holodeck/rec_center/wildlife) "aB" = ( /obj/effect/holodeck_effect/sparks, -/turf/open/floor/holofloor{ - icon_state = "engine"; - name = "Burn-Mix Floor"; - initial_gas_mix = "o2=2500;plasma=5000;TEMP=370" - }, +/turf/open/floor/holofloor/plating/burnmix, /area/holodeck/rec_center/burn) "aC" = ( /turf/open/floor/holofloor{ @@ -5817,6 +5801,21 @@ }, /turf/open/floor/plasteel/delivery, /area/centcom/ferry) +"sd" = ( +/obj/structure/flora/tree/pine, +/turf/open/floor/holofloor/snow/cold, +/area/holodeck/rec_center/winterwonderland) +"sc" = ( +/obj/structure/flora/grass/brown, +/turf/open/floor/holofloor/snow/cold, +/area/holodeck/rec_center/winterwonderland) +"sb" = ( +/obj/structure/flora/bush, +/turf/open/floor/holofloor/snow/cold, +/area/holodeck/rec_center/winterwonderland) +"sa" = ( +/turf/open/floor/holofloor/snow/cold, +/area/holodeck/rec_center/winterwonderland) (1,1,1) = {" aa @@ -60303,29 +60302,29 @@ ab ab "} (213,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +ad +af +af +af +af +af +af +af +af +af +af +ad +af +af +af +af +af +af +af +af +af +af +ad ab ab ab @@ -60560,29 +60559,29 @@ ab ab "} (214,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +ae +sa +sa +sa +sa +sa +sa +sa +sa +sa +sa +aV +ag +ag +ag +ag +ag +ag +ag +ag +ag +ag +cS ab ab ab @@ -60817,29 +60816,29 @@ ab ab "} (215,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +ae +sa +sb +sa +sa +sa +sd +sc +sa +sa +sa +aV +ag +ag +ag +ag +ag +ag +ag +ag +ag +ag +cS ab ab ab @@ -61074,29 +61073,29 @@ ab ab "} (216,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +ae +sa +sa +sa +sa +sa +sa +sa +sa +sa +sa +aV +ag +ag +ag +ag +ag +ag +ag +ag +ag +ag +cS ab ab ab @@ -61331,29 +61330,29 @@ ab ab "} (217,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +ae +sa +sa +sc +sa +sa +sa +sa +sa +sc +sa +aV +ag +ag +ag +ag +ag +ag +ag +ag +ag +ag +cS ab ab ab @@ -61588,29 +61587,29 @@ ab ab "} (218,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +ae +sa +sa +sa +sa +sa +sb +sa +sa +sa +sa +aV +ag +ag +ag +ag +ag +ag +ag +ag +ag +ag +cS ab ab ab @@ -61846,27 +61845,27 @@ ab "} (219,1,1) = {" ad -af -af -af -af -af -af -af -af -af -af +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak ad -af -af -af -af -af -af -af -af -af -af +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak ad ab ab @@ -62103,7 +62102,7 @@ ab "} (220,1,1) = {" ae -ag +ax ax ax ax diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 46d5f54b002..70c34165632 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -13,7 +13,7 @@ var/log_amount = 10 /obj/structure/flora/tree/attackby(obj/item/weapon/W, mob/user, params) - if(!cut && log_amount) + if(!cut && log_amount && (!(NODECONSTRUCT in flags))) if(W.sharpness && W.force > 0) if(W.hitsound) playsound(get_turf(src), W.hitsound, 100, 0, 0) diff --git a/code/modules/holodeck/areas.dm b/code/modules/holodeck/areas.dm index 04a469569cb..cd6a74581be 100644 --- a/code/modules/holodeck/areas.dm +++ b/code/modules/holodeck/areas.dm @@ -80,6 +80,8 @@ /area/holodeck/rec_center/pet_lounge name = "Holodeck - Pet Playground" +/area/holodeck/rec_center/winterwonderland + name = "Holodeck - Winter Wonderland" // Bad programs @@ -95,3 +97,6 @@ name = "Holodeck - Holdout Bunker" restricted = 1 +/area/holodeck/rec_center/anthophila + name = "Holodeck - Anthophila" + restricted = 1 \ No newline at end of file diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index dbed389e78a..5daa8a22d2f 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -91,3 +91,6 @@ /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten, /mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/dog/corgi/puppy, /mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/pet/fox) + +/obj/effect/holodeck_effect/mobspawner/bee + mobtype = /mob/living/simple_animal/hostile/poison/bees/toxin \ No newline at end of file diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index 07ce281b880..92a420f8c9f 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -11,6 +11,10 @@ name = "Holodeck Projector Floor" icon_state = "engine" +/turf/open/floor/holofloor/plating/burnmix + name = "Burn-mix Floor" + initial_gas_mix = "o2=2500;plasma=5000;TEMP=370" + /turf/open/floor/holofloor/grass gender = PLURAL name = "lush grass" @@ -83,3 +87,18 @@ return 0 if(intact) queue_smooth(src) + +/turf/open/floor/holofloor/snow + name = "snow" + desc = "Looks cold." + icon = 'icons/turf/snow.dmi' + icon_state = "snow" + slowdown = 2 + +/turf/open/floor/holofloor/snow/cold + temperature = 180 + +/turf/open/floor/holofloor/asteroid + name = "asteroid sand" + icon = 'icons/turf/floors.dmi' + icon_state = "asteroid" \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 249bf3bbe36..431bf23ff2e 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -205,6 +205,10 @@ BB.bees |= src beehome = BB +/mob/living/simple_animal/hostile/poison/bees/toxin/New() + . = ..() + var/datum/reagent/R = pick(typesof(/datum/reagent/toxin)) + assign_reagent(chemical_reagents_list[initial(R.id)]) /mob/living/simple_animal/hostile/poison/bees/queen name = "queen bee"