diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 645f7c1e4c7..f29cac64240 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -30,10 +30,7 @@ }, /area/ruin/unpowered) "g" = ( -/obj/structure/reagent_dispensers/water_cooler{ - name = "punch cooler"; - reagent_id = /datum/reagent/consumable/ethanol/bacchus_blessing - }, +/obj/structure/reagent_dispensers/water_cooler/pizzaparty, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ oxygen = 14; diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index bd15d43e0be..ad073b4bf54 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -495,7 +495,7 @@ var/list/teleport_runes = list() /obj/effect/rune/narsie/New() ..() cultist_name = "Summon [SSticker.cultdat ? SSticker.cultdat.entity_name : "your god"]" - cultist_desc = "tears apart dimensional barriers, calling forth [SSticker.cultdat.entity_title3]. Requires 9 invokers." + cultist_desc = "tears apart dimensional barriers, calling forth [SSticker.cultdat ? SSticker.cultdat.entity_title3 : "your god"]. Requires 9 invokers." /obj/effect/rune/narsie/check_icon() return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index c0d958cd2ae..26fc09ffe31 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -32,6 +32,8 @@ if(resistance_flags & INDESTRUCTIBLE) return if(istype(C, /obj/item/wirecutters)) + var/obj/item/wirecutters/W = C + playsound(loc, W.usesound, 50, 1) to_chat(user, "Slicing [name] joints...") deconstruct() else diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index c568a9801a6..b18d5aca07f 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -19,12 +19,10 @@ /turf/simulated/floor/plating/damaged/New() ..() - icon_state = icon_plating break_tile() /turf/simulated/floor/plating/burnt/New() ..() - icon_state = icon_plating burn_tile() /turf/simulated/floor/plating/update_icon() diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index 57e851460c8..fc39035618e 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -64,7 +64,7 @@ attacktext = "punches" deathmessage = "falls apart into a fine dust." -/mob/living/simple_animal/hostile/spawner +/mob/living/simple_animal/hostile/spawner/nether name = "netherworld link" desc = null //see examine() icon_state = "nether" @@ -76,18 +76,18 @@ mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody) faction = list("nether") -/obj/structure/spawner/nether/Initialize() +/mob/living/simple_animal/hostile/spawner/nether/Initialize() .=..() START_PROCESSING(SSprocessing, src) -/obj/structure/spawner/nether/examine(mob/user) +/mob/living/simple_animal/hostile/spawner/nether/examine(mob/user) ..() if(isskeleton(user)) to_chat(user, "A direct link to another dimension full of creatures very happy to see you. You can see your house from here!") else to_chat(user, "A direct link to another dimension full of creatures not very happy to see you. Entering the link would be a very bad idea.") -/obj/structure/spawner/nether/attack_hand(mob/user) +/mob/living/simple_animal/hostile/spawner/nether/attack_hand(mob/user) . = ..() if(isskeleton(user)) to_chat(user, "You don't feel like going home yet...") @@ -96,7 +96,7 @@ "Touching the portal, you are quickly pulled through into a world of unimaginable horror!") contents.Add(user) -/obj/structure/spawner/nether/process() +/mob/living/simple_animal/hostile/spawner/nether/process() for(var/mob/living/M in contents) if(M) playsound(src, 'sound/magic/demon_consume.ogg', 50, 1) diff --git a/code/modules/nano/modules/nano_module.dm b/code/modules/nano/modules/nano_module.dm index d33b59528f9..c62067bfaf8 100644 --- a/code/modules/nano/modules/nano_module.dm +++ b/code/modules/nano/modules/nano_module.dm @@ -1,6 +1,6 @@ /datum/nano_module var/name - var/host + var/datum/host /datum/nano_module/New(var/host) src.host = host @@ -8,5 +8,9 @@ /datum/nano_module/nano_host() return host ? host : src +/datum/nano_module/on_ui_close(mob/user) + if(host) + host.on_ui_close(user) + /datum/nano_module/proc/can_still_topic(var/datum/topic_state/state = default_state) return CanUseTopic(usr, state) == STATUS_INTERACTIVE diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index b3c98f82b54..e06a0dcb3fb 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -220,6 +220,7 @@ icon_state = "water_cooler" anchored = 1 tank_volume = 500 + reagent_id = "water" var/paper_cups = 25 //Paper cups left from the cooler /obj/structure/reagent_dispensers/water_cooler/examine(mob/user) diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm index 915597a162d..b634aba5c4c 100644 --- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm +++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm @@ -75,6 +75,10 @@ climbable = TRUE max_integrity = 100 can_deconstruct = TRUE + anchored = TRUE + density = TRUE + unacidable = TRUE + resistance_flags = FIRE_PROOF desc = "A massive brass gear. You could probably secure or unsecure it with a wrench, or just climb over it." /obj/structure/clockwork/wall_gear/displaced @@ -227,7 +231,7 @@ icon_state = "fallen_armor" w_class = WEIGHT_CLASS_NORMAL -//Ratvarian spear: A relatively fragile spear from the Celestial Derelict. Deals extreme damage to silicons and enemy cultists, but doesn't last long when summoned. +//Ratvarian spear /obj/item/clockwork/weapon/ratvarian_spear name = "ratvarian spear" desc = "A razor-sharp spear made of brass. It thrums with barely-contained energy." diff --git a/code/modules/ruins/lavalandruin_code/pizzaparty.dm b/code/modules/ruins/lavalandruin_code/pizzaparty.dm index f2e73069c1b..3201652c371 100644 --- a/code/modules/ruins/lavalandruin_code/pizzaparty.dm +++ b/code/modules/ruins/lavalandruin_code/pizzaparty.dm @@ -4,4 +4,8 @@ /obj/item/pizzabox/meat = 3, /obj/item/pizzabox/mushroom = 3, /obj/item/pizza_bomb = 1) - lootdoubles = FALSE \ No newline at end of file + lootdoubles = FALSE + +/obj/structure/reagent_dispensers/water_cooler/pizzaparty + name = "punch cooler" + reagent_id = "bacchus_blessing" \ No newline at end of file