From 5f773abf9b10f7a1803782e454be34f1aefb168e Mon Sep 17 00:00:00 2001 From: MMMiracles Date: Tue, 31 May 2016 21:21:23 -0400 Subject: [PATCH 1/4] sorry timmy --- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 64 +++++++++++++++++++ code/datums/ruins/lavaland.dm | 8 +++ code/modules/reagents/reagent_dispenser.dm | 7 +- 3 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 _maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm new file mode 100644 index 00000000000..81061b83673 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -0,0 +1,64 @@ +"a" = (/turf/template_noop,/area/template_noop) +"b" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"c" = (/obj/structure/lattice,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"d" = (/turf/closed/wall{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/unpowered) +"e" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"f" = (/obj/structure/table/wood,/obj/item/weapon/storage/box/cups,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"g" = (/obj/structure/reagent_dispensers/water_cooler{name = "punch cooler"; reagent = "bacchus_blessing"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"h" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"i" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"j" = (/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"k" = (/obj/structure/table/wood,/obj/effect/spawner/lootdrop{loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); name = "pizza spawner"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"l" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/table/wood,/obj/effect/spawner/lootdrop{loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); name = "pizza spawner"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"m" = (/obj/item/chair/wood/wings,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"n" = (/obj/effect/glowshroom/single,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"o" = (/obj/item/trash/plate,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"p" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"q" = (/obj/item/chair/wood/wings,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"r" = (/obj/structure/chair/wood/wings,/obj/effect/decal/remains/human,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"s" = (/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"t" = (/obj/effect/glowshroom/single,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"u" = (/obj/structure/lattice,/obj/item/chair/wood/wings,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"v" = (/obj/item/weapon/kitchen/fork,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"w" = (/obj/structure/table/wood,/obj/effect/spawner/lootdrop{loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); name = "pizza spawner"},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"x" = (/obj/structure/table/wood,/obj/item/trash/plate,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"y" = (/obj/structure/table/wood,/obj/effect/glowshroom/single,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"z" = (/obj/structure/table/wood,/obj/item/trash/plate,/obj/item/weapon/kitchen/fork,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"A" = (/obj/structure/lattice,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"B" = (/obj/structure/chair/wood/wings{tag = "icon-wooden_chair_wings (EAST)"; icon_state = "wooden_chair_wings"; dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"C" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita,/obj/item/trash/plate,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"D" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meat,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"E" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"F" = (/obj/structure/table/wood,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"G" = (/obj/item/chair/wood/wings,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"H" = (/obj/item/weapon/kitchen/fork,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"I" = (/obj/effect/glowshroom/single,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"J" = (/obj/structure/chair/wood/wings{tag = "icon-wooden_chair_wings (NORTH)"; icon_state = "wooden_chair_wings"; dir = 1},/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"K" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"L" = (/obj/structure/lattice,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"M" = (/obj/item/weapon/kitchen/knife,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"N" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +"O" = (/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) + +(1,1,1) = {" +aaaaaaaaaaaaaaaaaaaa +aabbbaabbbbbbbbbaaaa +aabbbbbbbbbbbbbbbbaa +abbbbbbbbbbbbbbbbbaa +abbbbbbbbccbbbbbbbaa +aabbddddeeeeddddbbba +aabbbbfghijekkldbbba +abbbcmnophhhhhiecbba +abbbcehhqrsrstheubba +abbcevhhwxyzsseAbbba +abbchhcBCDEFGsHecbba +abcehveIJhqqhoKebbba +abceehhhhhLhMnNdbbba +abbcOheddcccddddbbaa +abbceecbbbbbbbbbbbaa +aabbddbbbbbbbbbbbbaa +aabbbbbbbbbbbbbbbaaa +aaabbbbbbbbbbbbbbaaa +aaaaabbbbbbbbaaaaaaa +aaaaaaaaaaaaaaaaaaaa +"} diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 9a404f07680..5e6553da2c0 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -182,3 +182,11 @@ lived here before. You swear you hear rattling coming from the inside." suffix = "lavaland_surface_tomb.dmm" cost = 10 + +/datum/map_template/ruin/lavaland/pizza + name = "Ruined Pizza Party" + id = "pizza" + description = "Little Timmy's birthday pizza-bash took a turn for the worse \ + when a bluespace anomaly passed by." + allow_duplicates = FALSE + cost = 5 diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 8745fce43a2..c2ba6ef9cbb 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -126,16 +126,17 @@ /obj/structure/reagent_dispensers/water_cooler - name = "water cooler" - desc = "A machine that dispenses water to drink." + name = "liquid cooler" + desc = "A machine that dispenses liquid to drink." icon = 'icons/obj/vending.dmi' icon_state = "water_cooler" anchored = 1 var/cups = 50 + var/reagent = "water" /obj/structure/reagent_dispensers/water_cooler/New() ..() - reagents.add_reagent("water",500) + reagents.add_reagent(reagent,500) /obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/carbon/human/user) if((!istype(user)) || (user.stat)) From 84c11c45bceb999026c6c37d2be261461c16ee4a Mon Sep 17 00:00:00 2001 From: MMMiracles Date: Tue, 31 May 2016 21:22:34 -0400 Subject: [PATCH 2/4] dang tgm --- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 825 ++++++++++++++++-- 1 file changed, 764 insertions(+), 61 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 81061b83673..48a4fae6e2d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -1,64 +1,767 @@ -"a" = (/turf/template_noop,/area/template_noop) -"b" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"c" = (/obj/structure/lattice,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"d" = (/turf/closed/wall{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/unpowered) -"e" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"f" = (/obj/structure/table/wood,/obj/item/weapon/storage/box/cups,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"g" = (/obj/structure/reagent_dispensers/water_cooler{name = "punch cooler"; reagent = "bacchus_blessing"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"h" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"i" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"j" = (/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"k" = (/obj/structure/table/wood,/obj/effect/spawner/lootdrop{loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); name = "pizza spawner"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"l" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/table/wood,/obj/effect/spawner/lootdrop{loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); name = "pizza spawner"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"m" = (/obj/item/chair/wood/wings,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"n" = (/obj/effect/glowshroom/single,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"o" = (/obj/item/trash/plate,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"p" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"q" = (/obj/item/chair/wood/wings,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"r" = (/obj/structure/chair/wood/wings,/obj/effect/decal/remains/human,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"s" = (/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"t" = (/obj/effect/glowshroom/single,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"u" = (/obj/structure/lattice,/obj/item/chair/wood/wings,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"v" = (/obj/item/weapon/kitchen/fork,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"w" = (/obj/structure/table/wood,/obj/effect/spawner/lootdrop{loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); name = "pizza spawner"},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"x" = (/obj/structure/table/wood,/obj/item/trash/plate,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"y" = (/obj/structure/table/wood,/obj/effect/glowshroom/single,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"z" = (/obj/structure/table/wood,/obj/item/trash/plate,/obj/item/weapon/kitchen/fork,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"A" = (/obj/structure/lattice,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"B" = (/obj/structure/chair/wood/wings{tag = "icon-wooden_chair_wings (EAST)"; icon_state = "wooden_chair_wings"; dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"C" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita,/obj/item/trash/plate,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"D" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meat,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"E" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"F" = (/obj/structure/table/wood,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"G" = (/obj/item/chair/wood/wings,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"H" = (/obj/item/weapon/kitchen/fork,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"I" = (/obj/effect/glowshroom/single,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"J" = (/obj/structure/chair/wood/wings{tag = "icon-wooden_chair_wings (NORTH)"; icon_state = "wooden_chair_wings"; dir = 1},/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"K" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"L" = (/obj/structure/lattice,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"M" = (/obj/item/weapon/kitchen/knife,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"N" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) -"O" = (/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered) +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"c" = ( +/obj/structure/lattice, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"d" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface + }, +/area/ruin/unpowered) +"e" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"f" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/box/cups, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"g" = ( +/obj/structure/reagent_dispensers/water_cooler{ + name = "punch cooler"; + reagent = "bacchus_blessing" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"h" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"i" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"j" = ( +/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"k" = ( +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop{ + loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); + name = "pizza spawner" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"l" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop{ + loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); + name = "pizza spawner" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"m" = ( +/obj/item/chair/wood/wings, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"n" = ( +/obj/effect/glowshroom/single, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"o" = ( +/obj/item/trash/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"p" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"q" = ( +/obj/item/chair/wood/wings, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"r" = ( +/obj/structure/chair/wood/wings, +/obj/effect/decal/remains/human, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"s" = ( +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"t" = ( +/obj/effect/glowshroom/single, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"u" = ( +/obj/structure/lattice, +/obj/item/chair/wood/wings, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"v" = ( +/obj/item/weapon/kitchen/fork, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"w" = ( +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop{ + loot = list(/obj/item/pizzabox/margherita = 30, /obj/item/pizzabox/meat = 30, /obj/item/pizzabox/mushroom = 30, /obj/item/pizzabox/bomb = 10); + name = "pizza spawner" + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"x" = ( +/obj/structure/table/wood, +/obj/item/trash/plate, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"y" = ( +/obj/structure/table/wood, +/obj/effect/glowshroom/single, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"z" = ( +/obj/structure/table/wood, +/obj/item/trash/plate, +/obj/item/weapon/kitchen/fork, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"A" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/space) +"B" = ( +/obj/structure/chair/wood/wings{ + tag = "icon-wooden_chair_wings (EAST)"; + icon_state = "wooden_chair_wings"; + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"C" = ( +/obj/structure/table/wood, +/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita, +/obj/item/trash/plate, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"D" = ( +/obj/structure/table/wood, +/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meat, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"E" = ( +/obj/structure/table/wood, +/obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"F" = ( +/obj/structure/table/wood, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"G" = ( +/obj/item/chair/wood/wings, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"H" = ( +/obj/item/weapon/kitchen/fork, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"I" = ( +/obj/effect/glowshroom/single, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"J" = ( +/obj/structure/chair/wood/wings{ + tag = "icon-wooden_chair_wings (NORTH)"; + icon_state = "wooden_chair_wings"; + dir = 1 + }, +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"K" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"L" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"M" = ( +/obj/item/weapon/kitchen/knife, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"N" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"O" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) (1,1,1) = {" -aaaaaaaaaaaaaaaaaaaa -aabbbaabbbbbbbbbaaaa -aabbbbbbbbbbbbbbbbaa -abbbbbbbbbbbbbbbbbaa -abbbbbbbbccbbbbbbbaa -aabbddddeeeeddddbbba -aabbbbfghijekkldbbba -abbbcmnophhhhhiecbba -abbbcehhqrsrstheubba -abbcevhhwxyzsseAbbba -abbchhcBCDEFGsHecbba -abcehveIJhqqhoKebbba -abceehhhhhLhMnNdbbba -abbcOheddcccddddbbaa -abbceecbbbbbbbbbbbaa -aabbddbbbbbbbbbbbbaa -aabbbbbbbbbbbbbbbaaa -aaabbbbbbbbbbbbbbaaa -aaaaabbbbbbbbaaaaaaa -aaaaaaaaaaaaaaaaaaaa +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +b +b +a +a +b +b +b +b +b +b +b +b +a +a +a +a +a +"} +(3,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +c +c +b +b +b +b +a +a +a +"} +(4,1,1) = {" +a +b +b +b +b +b +b +b +b +c +c +e +e +c +c +b +b +b +a +a +"} +(5,1,1) = {" +a +b +b +b +b +d +b +c +c +e +h +h +e +O +e +d +b +b +a +a +"} +(6,1,1) = {" +a +a +b +b +b +d +b +m +e +v +h +v +h +h +e +d +b +b +b +a +"} +(7,1,1) = {" +a +a +b +b +b +d +f +n +h +h +c +e +h +e +c +b +b +b +b +a +"} +(8,1,1) = {" +a +b +b +b +b +d +g +o +h +h +B +I +h +d +b +b +b +b +b +a +"} +(9,1,1) = {" +a +b +b +b +b +e +h +p +q +w +C +J +h +d +b +b +b +b +b +a +"} +(10,1,1) = {" +a +b +b +b +c +e +i +h +r +x +D +h +h +c +b +b +b +b +b +a +"} +(11,1,1) = {" +a +b +b +b +c +e +j +h +s +y +E +q +L +c +b +b +b +b +b +a +"} +(12,1,1) = {" +a +b +b +b +b +e +e +h +r +z +F +q +h +c +b +b +b +b +b +a +"} +(13,1,1) = {" +a +b +b +b +b +d +k +h +s +s +G +h +M +d +b +b +b +b +b +a +"} +(14,1,1) = {" +a +b +b +b +b +d +k +h +t +s +s +o +n +d +b +b +b +b +a +a +"} +(15,1,1) = {" +a +b +b +b +b +d +l +i +h +e +H +K +N +d +b +b +b +b +a +a +"} +(16,1,1) = {" +a +b +b +b +b +d +d +e +e +A +e +e +d +d +b +b +b +b +a +a +"} +(17,1,1) = {" +a +a +b +b +b +b +b +c +u +b +c +b +b +b +b +b +b +b +a +a +"} +(18,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a "} From a99e3d8c63d52c16bfde39f0e7ea3847fe677691 Mon Sep 17 00:00:00 2001 From: MMMiracles Date: Tue, 31 May 2016 21:26:31 -0400 Subject: [PATCH 3/4] im on a roll and i haven't even submitted the pr yet --- code/datums/ruins/lavaland.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 5e6553da2c0..e059a9a409e 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -188,5 +188,6 @@ id = "pizza" description = "Little Timmy's birthday pizza-bash took a turn for the worse \ when a bluespace anomaly passed by." + suffix = "lavaland_surface_pizzaparty.dmm" allow_duplicates = FALSE cost = 5 From b459b3dd226b00f4867b9c02a0748ed835c47ed7 Mon Sep 17 00:00:00 2001 From: MMMiracles Date: Tue, 31 May 2016 22:16:11 -0400 Subject: [PATCH 4/4] party hats --- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 48a4fae6e2d..e99d0317f8f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -86,6 +86,7 @@ name = "pizza spawner" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb2, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -187,6 +188,7 @@ "y" = ( /obj/structure/table/wood, /obj/effect/glowshroom/single, +/obj/item/weapon/a_gift, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -324,6 +326,26 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/ruin/unpowered) +"Q" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/a_gift, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) +"P" = ( +/obj/structure/chair/wood/wings, +/obj/effect/decal/remains/human, +/obj/item/clothing/head/festive{ + desc = "A festive party hat with the name 'timmy' scribbled on the front."; + name = "party hat" + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered) (1,1,1) = {" a @@ -470,7 +492,7 @@ h h c e -h +Q e c b @@ -514,7 +536,7 @@ q w C J -h +Q d b b @@ -532,7 +554,7 @@ c e i h -r +P x D h