diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index 761db44137a2..44fe6ae90ae2 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -249,3 +249,12 @@ CIVILIAN SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, ) + +/datum/skills/civilian/survivor/pizza_delivery_driver + name = "Survivor - Pizza Galaxy Delivery Driver" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 09b4379e7bb7..9d4b0236da02 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -2927,6 +2927,45 @@ boxes += extra update_icon() +// Pizza Galaxy Pizza + +/obj/item/pizzabox/pizza_galaxy + icon = 'icons/obj/items/pizza_galaxy_pizza.dmi' + +/obj/item/pizzabox/pizza_galaxy/margherita/Initialize() + . = ..() + pizza = new /obj/item/reagent_container/food/snacks/sliceable/pizza/margherita(src) + boxtag = "Margherita Deluxe" + +/obj/item/pizzabox/pizza_galaxy/vegetable/Initialize() + . = ..() + pizza = new /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza(src) + boxtag = "Gourmet Vegatable" + +/obj/item/pizzabox/pizza_galaxy/mushroom/Initialize() + . = ..() + pizza = new /obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza(src) + boxtag = "Mushroom Special" + +/obj/item/pizzabox/pizza_galaxy/meat/Initialize() + . = ..() + pizza = new /obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza(src) + boxtag = "Meatlover's Supreme" + +/// Mystery Pizza, made with random ingredients! +/obj/item/pizzabox/pizza_galaxy/mystery/Initialize(mapload, ...) + . = ..() + pizza = new /obj/item/reagent_container/food/snacks/sliceable/pizza/mystery(src) + boxtag = "Mystery Pizza" + +// Pre-stacked boxes for reqs +/obj/item/pizzabox/pizza_galaxy/mystery/stack/Initialize(mapload, ...) + . = ..() + for(var/i in 1 to 2) + var/obj/item/pizzabox/pizza_galaxy/mystery/extra = new(src) + boxes += extra + update_icon() + /////////////////////////////////////////// // new old food stuff from bs12 /////////////////////////////////////////// diff --git a/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm b/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm index 353496411020..c3431eb24ee2 100644 --- a/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm +++ b/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm @@ -203,7 +203,7 @@ name = "Survivor - Hybrisa - Civilian - Pizza Galaxy Delivery Driver" assignment = "Civilian - Pizza Galaxy Delivery Driver" idtype = /obj/item/card/id/pizza - skills = /datum/skills/civilian/survivor + skills = /datum/skills/civilian/survivor/pizza_delivery_driver flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) @@ -218,7 +218,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/pizza_galaxy(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/pizza_galaxy/mystery(new_human.back), WEAR_IN_BACK) if(45 to 60) // Pizza Delivery (Rarer) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headband/red(new_human), WEAR_HEAD) @@ -226,8 +226,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/hybrisa/civilian_vest(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/meatpizzaslice(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/pizza_galaxy/mystery(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/kt42, WEAR_R_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/kt42, WEAR_IN_R_STORE) @@ -239,7 +238,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/cbrn(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/meatpizzaslice(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/pizza_galaxy/mystery(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, WEAR_R_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) @@ -1043,7 +1042,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/pizza_galaxy(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/pizza_galaxy/mystery(new_human.back), WEAR_IN_BACK) if(4) // Fire Protection new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies(new_human), WEAR_BODY) diff --git a/icons/obj/items/pizza_galaxy_pizza.dmi b/icons/obj/items/pizza_galaxy_pizza.dmi new file mode 100644 index 000000000000..eee24202788e Binary files /dev/null and b/icons/obj/items/pizza_galaxy_pizza.dmi differ diff --git a/icons/obj/structures/props/32x64_hybrisabillboards.dmi b/icons/obj/structures/props/32x64_hybrisabillboards.dmi index 749a44950697..7f1310c0224a 100644 Binary files a/icons/obj/structures/props/32x64_hybrisabillboards.dmi and b/icons/obj/structures/props/32x64_hybrisabillboards.dmi differ diff --git a/icons/obj/structures/props/hybrisa_vehicles/box_van_pizza.dmi b/icons/obj/structures/props/hybrisa_vehicles/box_van_pizza.dmi index f2b79fe32479..b91d5a8c156f 100644 Binary files a/icons/obj/structures/props/hybrisa_vehicles/box_van_pizza.dmi and b/icons/obj/structures/props/hybrisa_vehicles/box_van_pizza.dmi differ diff --git a/icons/obj/vehicles/box_van.dmi b/icons/obj/vehicles/box_van.dmi index 765b3c1293f7..f45d5dc075b8 100644 Binary files a/icons/obj/vehicles/box_van.dmi and b/icons/obj/vehicles/box_van.dmi differ diff --git a/icons/obj/vehicles/pizza_van.dmi b/icons/obj/vehicles/pizza_van.dmi index 733b6b78a660..8c1106315af9 100644 Binary files a/icons/obj/vehicles/pizza_van.dmi and b/icons/obj/vehicles/pizza_van.dmi differ diff --git a/maps/interiors/pizza_van.dmm b/maps/interiors/pizza_van.dmm index 2c72f7da7044..9c8884470ace 100644 --- a/maps/interiors/pizza_van.dmm +++ b/maps/interiors/pizza_van.dmm @@ -175,7 +175,7 @@ /obj/structure/closet/crate/plastic{ pixel_y = 8 }, -/obj/item/pizzabox/mystery/stack{ +/obj/item/pizzabox/pizza_galaxy/mystery/stack{ pixel_y = 12 }, /obj/item/stack/sheet/cardboard{ diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm index 17c8046167c4..728d2ce75160 100644 --- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm +++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm @@ -3697,6 +3697,11 @@ /obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent3{ pixel_y = 28 }, +/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard5{ + dir = 6; + pixel_y = 32; + pixel_x = 16 + }, /turf/open/floor/prison{ icon_state = "cell_stripe" }, @@ -4749,10 +4754,9 @@ dir = 1 }, /obj/structure/prop/hybrisa/boulders/smallboulderdark/boulder_dark3, -/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard1{ - icon_state = "billboard2"; - pixel_y = 34; - dir = 10 +/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard5{ + dir = 6; + pixel_y = 34 }, /turf/open/auto_turf/hybrisashale/layer1, /area/lv759/outdoors/colony_streets/north_street) @@ -5615,13 +5619,13 @@ pixel_x = -8; pixel_y = 12 }, -/obj/item/pizzabox, /obj/item/poster, /mob/living/simple_animal/rat/brown/Old_Timmy, /obj/item/reagent_container/syringe{ icon_state = "broken" }, /obj/structure/prop/hybrisa/misc/graffiti/graffiti5, +/obj/item/pizzabox/pizza_galaxy, /turf/open/floor/plating, /area/lv759/indoors/hobosecret) "aPb" = ( @@ -9808,11 +9812,9 @@ /turf/open/floor/hybrisa/carpet/carpetblack, /area/lv759/indoors/weyyu_office/breakroom) "btV" = ( -/obj/item/pizzabox/meat, -/obj/item/reagent_container/food/snacks/meatpizzaslice, /obj/item/tool/pen{ pixel_x = 9; - pixel_y = 8 + pixel_y = 12 }, /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4; @@ -9822,9 +9824,13 @@ color = "#EBD9B7" }, /obj/item/clothing/head/helmet/hybrisa/kelland_mining_helmet{ - pixel_y = 8; + pixel_y = 12; pixel_x = -4 }, +/obj/item/pizzabox/pizza_galaxy/meat{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice, /turf/open/floor/hybrisa/carpet/carpetbeige, /area/lv759/indoors/mining_outpost/east_command) "bub" = ( @@ -12981,6 +12987,9 @@ pixel_x = -21; pixel_y = 3 }, +/obj/item/stack/sheet/cardboard{ + layer = 1 + }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/landing_zone_2) "bTd" = ( @@ -16685,11 +16694,11 @@ /area/lv759/indoors/spaceport/starglider) "cuj" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/pizzabox/vegetable, /obj/item/reagent_container/food/drinks/coffee/cuppa_joes{ pixel_x = 6; pixel_y = 6 }, +/obj/item/pizzabox/pizza_galaxy/vegetable, /obj/item/trash/hybrisa/cuppa_joes/lid, /turf/open/floor/hybrisa/carpet/carpetblack, /area/lv759/indoors/weyyu_office/breakroom) @@ -17721,6 +17730,20 @@ icon_state = "whitegreen" }, /area/lv759/indoors/hospital/central_hallway) +"cBE" = ( +/obj/effect/hybrisa/decal/dirt, +/obj/structure/prop/hybrisa/lattice_prop/lattice_6{ + pixel_y = 16; + layer = 6 + }, +/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard5{ + dir = 10; + pixel_y = 20; + layer = 9; + pixel_x = 8 + }, +/turf/open/hybrisa/street/sidewalkfull, +/area/lv759/outdoors/colony_streets/central_streets) "cBH" = ( /obj/structure/machinery/light/small/blue{ dir = 4 @@ -19455,22 +19478,6 @@ "cNi" = ( /turf/open/auto_turf/hybrisashale/layer2, /area/lv759/outdoors/colony_streets/north_street) -"cNl" = ( -/obj/structure/prop/hybrisa/lattice_prop/lattice_6{ - pixel_y = 16; - layer = 6 - }, -/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard1{ - icon_state = "billboard2"; - pixel_y = 20; - dir = 10; - layer = 9; - pixel_x = -26 - }, -/turf/open/hybrisa/street/sidewalk{ - dir = 4 - }, -/area/lv759/outdoors/colony_streets/central_streets) "cNn" = ( /obj/structure/machinery/vending/dinnerware, /obj/effect/hybrisa/decal/dirt, @@ -22740,16 +22747,19 @@ "djs" = ( /obj/structure/prop/hybrisa/misc/fake/wire/red{ dir = 4; - pixel_y = 4 + pixel_y = 6 }, /obj/structure/prop/hybrisa/misc/fake/wire/blue{ - dir = 4 + dir = 4; + pixel_y = 12 }, -/obj/structure/platform/hybrisa/metalplatform1{ - dir = 1 +/obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent3{ + pixel_y = 28; + pixel_x = 6 }, /obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent3{ - pixel_y = 28 + pixel_y = 28; + pixel_x = -6 }, /turf/open/floor/plating, /area/lv759/outdoors/colony_streets/central_streets) @@ -23907,7 +23917,7 @@ layer = 6 }, /obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard5{ - dir = 8; + dir = 5; pixel_y = 20; layer = 9 }, @@ -25523,7 +25533,7 @@ pixel_x = -4; pixel_y = 6 }, -/obj/item/pizzabox/margherita, +/obj/item/pizzabox/pizza_galaxy/margherita, /obj/effect/decal/cleanable/flour, /obj/effect/hybrisa/decal/dirt, /obj/item/reagent_container/food/snacks/meat, @@ -26147,6 +26157,10 @@ pixel_x = 8; pixel_y = 20 }, +/obj/structure/sign/poster/propaganda{ + pixel_x = -8; + pixel_y = 34 + }, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -26593,10 +26607,11 @@ /area/lv759/indoors/power_plant/fusion_generators) "dMa" = ( /obj/structure/largecrate/random/barrel{ - layer = 2.9; + layer = 4.12; pixel_x = -8; pixel_y = -16 }, +/obj/structure/cargo_container/hybrisa/containersextended/kelland_right, /turf/open/hybrisa/street/sidewalk, /area/lv759/outdoors/landing_zone_2) "dMc" = ( @@ -33048,7 +33063,7 @@ /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/doughslice, /obj/item/reagent_container/food/snacks/dough, -/obj/item/pizzabox/margherita, +/obj/item/pizzabox/pizza_galaxy/margherita, /turf/open/floor/hybrisa/tile/tilered, /area/lv759/indoors/pizzaria) "eKp" = ( @@ -33308,7 +33323,7 @@ pixel_x = -3; pixel_y = 6 }, -/obj/item/pizzabox/margherita, +/obj/item/pizzabox/pizza_galaxy/margherita, /obj/effect/hybrisa/decal/dirt, /obj/item/reagent_container/food/snacks/margheritaslice{ desc = "A slice of classic pizza ruined by the corps."; @@ -37219,10 +37234,11 @@ /obj/effect/hybrisa/decal/dirt, /obj/structure/prop/hybrisa/misc/fake/wire/red{ dir = 4; - pixel_y = 4 + pixel_y = 12 }, /obj/structure/prop/hybrisa/misc/fake/wire/yellow{ - dir = 4 + dir = 4; + pixel_y = 6 }, /obj/structure/prop/hybrisa/misc/buildinggreeblies{ pixel_x = -12; @@ -39960,10 +39976,15 @@ }, /obj/item/tool/warning_cone{ pixel_x = -11; - pixel_y = 6 + pixel_y = -4 }, /obj/effect/decal/cleanable/blood/oil/streak, /obj/effect/hybrisa/decal/road/lines3, +/obj/structure/largecrate/random/mini{ + pixel_y = 8; + layer = 2.9; + pixel_x = -9 + }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/landing_zone_2) "fLe" = ( @@ -41944,9 +41965,6 @@ }, /area/lv759/outdoors/landing_zone_2) "fZz" = ( -/obj/structure/platform/hybrisa/metalplatform1{ - dir = 1 - }, /obj/item/trash/cigbutt{ pixel_x = 4 }, @@ -41957,11 +41975,12 @@ pixel_y = -12 }, /obj/structure/prop/hybrisa/misc/fake/wire/blue{ - dir = 4 + dir = 4; + pixel_y = 12 }, /obj/structure/prop/hybrisa/misc/fake/wire/red{ dir = 4; - pixel_y = -6 + pixel_y = 6 }, /turf/open/floor/plating, /area/lv759/outdoors/colony_streets/central_streets) @@ -47144,7 +47163,7 @@ }, /area/lv759/indoors/colonial_marshals/press_room) "gLT" = ( -/obj/item/defenses/handheld/planted_flag/range, +/obj/item/defenses/handheld/planted_flag/wy, /turf/open/floor/plating/prison, /area/lv759/outdoors/caveplateau) "gLX" = ( @@ -48330,9 +48349,8 @@ }, /obj/effect/hybrisa/decal/road/lines3, /obj/structure/largecrate/random/mini{ - layer = 8; pixel_x = 1; - pixel_y = 16 + pixel_y = 10 }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/landing_zone_2) @@ -53282,19 +53300,18 @@ layer = 5 }, /obj/structure/surface/table, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/item/pizzabox{ - layer = 3; - pixel_y = 12 - }, /obj/item/reagent_container/food/snacks/meatpizzaslice{ layer = 4; pixel_x = 3; pixel_y = 12 }, +/obj/item/pizzabox/pizza_galaxy{ + pixel_y = 12 + }, +/obj/item/reagent_container/food/drinks/coffee/cuppa_joes{ + pixel_x = -10; + pixel_y = 8 + }, /turf/open/floor/kutjevo/grey, /area/lv759/indoors/mining_outpost/northeast) "hEg" = ( @@ -53875,8 +53892,8 @@ }, /area/lv759/indoors/spaceport/kitchen) "hIj" = ( -/obj/structure/largecrate/random/barrel/brown, /obj/effect/hybrisa/decal/dirt, +/obj/structure/cargo_container/kelland/left, /turf/open/hybrisa/street/sidewalk, /area/lv759/outdoors/landing_zone_2) "hIo" = ( @@ -54595,7 +54612,9 @@ /turf/open/hybrisa/street/sidewalk, /area/lv759/outdoors/colony_streets/north_east_street_LZ) "hNP" = ( -/obj/structure/cargo_container/hybrisa/containersextended/kelland_right, +/obj/structure/cargo_container/hybrisa/containersextended/kelland_right{ + layer = 4.13 + }, /turf/open/hybrisa/street/cement3, /area/lv759/outdoors/landing_zone_2) "hNV" = ( @@ -55729,6 +55748,10 @@ }, /turf/closed/wall/hybrisa/spaceport_unmeltable, /area/lv759/oob) +"hWx" = ( +/obj/structure/cargo_container/hybrisa/containersextended/kelland_left, +/turf/open/hybrisa/street/cement3, +/area/lv759/outdoors/landing_zone_2) "hWB" = ( /obj/structure/largecrate/random/mini/small_case{ pixel_x = -9; @@ -59237,10 +59260,12 @@ "iwD" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/stack/sheet/cardboard, -/obj/item/pizzabox/mystery/stack, /obj/structure/machinery/chem_dispenser/soda{ pixel_y = 22 }, +/obj/item/pizzabox/pizza_galaxy/mystery/stack{ + pixel_y = 8 + }, /turf/open/floor/hybrisa/tile/tilered, /area/lv759/indoors/pizzaria) "iwH" = ( @@ -64435,12 +64460,6 @@ /obj/structure/barricade/handrail/strata{ layer = 3.1 }, -/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard3{ - dir = 5; - pixel_y = 32; - layer = 9; - pixel_x = -16 - }, /turf/open/floor/prison{ icon_state = "cell_stripe" }, @@ -65456,8 +65475,13 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/pizzabox, -/obj/item/reagent_container/food/drinks/cans/classcola, +/obj/item/pizzabox/pizza_galaxy{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/drinks/cans/classcola{ + pixel_y = 16; + pixel_x = 8 + }, /turf/open/floor/prison{ dir = 8; icon_state = "red" @@ -65853,8 +65877,13 @@ /area/lv759/indoors/derelict_ship) "juJ" = ( /obj/structure/surface/table, -/obj/item/pizzabox/meat, -/obj/item/reagent_container/food/drinks/cans/classcola, +/obj/item/pizzabox/pizza_galaxy/meat{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/drinks/cans/classcola{ + pixel_y = 16; + pixel_x = 8 + }, /turf/open/floor{ icon_state = "wood" }, @@ -70997,7 +71026,9 @@ "kik" = ( /obj/effect/hybrisa/decal/dirt, /obj/structure/closet/crate/plastic, -/obj/item/pizzabox/mystery/stack, +/obj/item/pizzabox/pizza_galaxy/mystery/stack{ + pixel_y = 8 + }, /turf/open/hybrisa/street/sidewalk{ dir = 1 }, @@ -83246,6 +83277,14 @@ icon = 'icons/turf/floors/hybrisa_dirt.dmi' }, /area/lv759/indoors/caves/south_east_caves) +"lQI" = ( +/obj/structure/barricade/handrail/hybrisa/road/plastic/red{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv759/outdoors/landing_zone_2) "lQL" = ( /obj/structure/machinery/landinglight/ds2/spoke, /obj/structure/barricade/handrail/strata{ @@ -84162,7 +84201,9 @@ }, /area/lv759/indoors/garage_workshop) "lXh" = ( -/obj/structure/largecrate/random/barrel/red, +/obj/structure/largecrate/random/barrel/red{ + pixel_x = -4 + }, /obj/effect/hybrisa/decal/dirt, /turf/open/hybrisa/street/sidewalk, /area/lv759/outdoors/landing_zone_2) @@ -85476,12 +85517,16 @@ /turf/open/floor/hybrisa/carpet/carpetgreen, /area/lv759/indoors/apartment/westbedrooms) "mhz" = ( -/obj/structure/largecrate/supply{ - pixel_y = 15; - layer = 4.2 - }, /obj/structure/barricade/handrail/hybrisa/road/plastic/red{ - layer = 4.2 + layer = 3 + }, +/obj/structure/largecrate/random/mini{ + pixel_y = 8; + layer = 2.9; + pixel_x = -9 + }, +/obj/item/stack/sheet/cardboard{ + layer = 1 }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/landing_zone_2) @@ -93279,16 +93324,17 @@ "nqk" = ( /obj/effect/hybrisa/decal/dirt, /obj/item/trash/cigbutt, +/obj/structure/prop/hybrisa/misc/buildinggreebliessmall{ + layer = 6; + pixel_x = -5 + }, /obj/structure/prop/hybrisa/misc/fake/wire/red{ dir = 4; - pixel_y = 4 + pixel_y = 12 }, /obj/structure/prop/hybrisa/misc/fake/wire/yellow{ - dir = 4 - }, -/obj/structure/prop/hybrisa/misc/buildinggreebliessmall{ - layer = 6; - pixel_x = -5 + dir = 4; + pixel_y = 6 }, /turf/open/floor/plating, /area/lv759/outdoors/colony_streets/north_street) @@ -98737,13 +98783,13 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 1 }, -/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard4{ - dir = 4; - pixel_y = 32 - }, /obj/structure/platform/hybrisa/metalplatform6{ dir = 1 }, +/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard5{ + dir = 9; + pixel_y = 34 + }, /turf/open/hybrisa/street/sidewalk, /area/lv759/outdoors/colony_streets/north_west_street) "oeS" = ( @@ -99124,14 +99170,15 @@ /turf/open/floor/prison, /area/lv759/indoors/garage_workshop) "ohX" = ( -/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard2{ - dir = 4; - pixel_y = 34 - }, /obj/structure/platform/hybrisa/metalplatform6{ dir = 1 }, /obj/effect/hybrisa/decal/dirt, +/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard1{ + icon_state = "billboard2"; + pixel_y = 34; + dir = 10 + }, /turf/open/floor/hybrisa/metal/grated{ dir = 1 }, @@ -101155,17 +101202,15 @@ /turf/open/floor/plating, /area/lv759/indoors/caves/north_east_caves) "oxj" = ( -/obj/structure/platform/hybrisa/metalplatform1{ - dir = 1 - }, /obj/effect/hybrisa/decal/dirt, /obj/structure/prop/hybrisa/misc/buildinggreeblies/greeble7, /obj/structure/prop/hybrisa/misc/fake/wire/blue{ - dir = 4 + dir = 4; + pixel_y = 12 }, /obj/structure/prop/hybrisa/misc/fake/wire/red{ dir = 4; - pixel_y = -6 + pixel_y = 6 }, /turf/open/floor/plating, /area/lv759/outdoors/colony_streets/central_streets) @@ -101769,21 +101814,19 @@ pixel_y = 12 }, /obj/effect/hybrisa/decal/dirt, -/obj/structure/prop/hybrisa/misc/fake/wire/red{ - dir = 4; - pixel_y = 4 - }, -/obj/structure/prop/hybrisa/misc/fake/wire/blue{ - dir = 4 - }, -/obj/structure/platform/hybrisa/metalplatform1{ - dir = 1 - }, /obj/item/hybrisa/misc/trash_bag_full_prop{ layer = 8; pixel_x = 3; pixel_y = -2 }, +/obj/structure/prop/hybrisa/misc/fake/wire/red{ + dir = 4; + pixel_y = 6 + }, +/obj/structure/prop/hybrisa/misc/fake/wire/blue{ + dir = 4; + pixel_y = 12 + }, /turf/open/floor/plating, /area/lv759/outdoors/colony_streets/central_streets) "oBq" = ( @@ -102885,9 +102928,8 @@ icon_state = "stop_decal5" }, /obj/structure/closet/crate/plastic, -/obj/item/pizzabox/mystery/stack{ - layer = 7; - pixel_y = 9 +/obj/item/pizzabox/pizza_galaxy/mystery/stack{ + pixel_y = 8 }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/north_east_street) @@ -106779,7 +106821,9 @@ /obj/effect/hybrisa/decal/road/road_edge{ icon_state = "road_edge_decal4" }, -/obj/structure/cargo_container/hybrisa/containersextended/greenwywingsleft, +/obj/structure/cargo_container/hybrisa/containersextended/greenwywingsleft{ + layer = 2.9 + }, /obj/structure/machinery/light/double/blue{ dir = 1 }, @@ -107529,15 +107573,14 @@ pixel_x = 7 }, /obj/structure/largecrate/supply{ - pixel_y = 15; - layer = 4.2 - }, -/obj/structure/barricade/handrail/hybrisa/road/plastic/red{ - layer = 4.2 + pixel_y = 15 }, /obj/item/stack/sheet/cardboard{ layer = 1 }, +/obj/structure/barricade/handrail/hybrisa/road/plastic/red{ + layer = 3 + }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/landing_zone_2) "prx" = ( @@ -112150,7 +112193,7 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 1 }, -/obj/item/pizzabox/margherita, +/obj/item/pizzabox/pizza_galaxy/margherita, /obj/effect/decal/cleanable/blood{ icon_state = "mgibbl1" }, @@ -115974,15 +116017,16 @@ /area/lv759/indoors/wy_research_complex/hangarbay) "qCZ" = ( /obj/effect/hybrisa/decal/dirt, +/obj/structure/prop/hybrisa/misc/buildinggreeblies/greeble7{ + pixel_y = 11 + }, /obj/structure/prop/hybrisa/misc/fake/wire/red{ dir = 4; - pixel_y = 4 + pixel_y = 12 }, /obj/structure/prop/hybrisa/misc/fake/wire/yellow{ - dir = 4 - }, -/obj/structure/prop/hybrisa/misc/buildinggreeblies/greeble7{ - pixel_y = 11 + dir = 4; + pixel_y = 6 }, /turf/open/floor/plating, /area/lv759/outdoors/colony_streets/north_street) @@ -116126,8 +116170,9 @@ dir = 4; icon_state = "stop_decal5" }, -/obj/structure/prop/hybrisa/vehicles/Armored_Truck/Blue{ - pixel_x = -20 +/obj/structure/prop/hybrisa/vehicles/Small_Truck/White_Cargo{ + dir = 1; + pixel_x = -3 }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/landing_zone_2) @@ -124730,7 +124775,10 @@ /obj/structure/coatrack{ icon_state = "coatrack1" }, -/obj/structure/filingcabinet{ +/obj/structure/coatrack{ + icon_state = "coatrack1" + }, +/obj/structure/coatrack{ icon_state = "coat_det" }, /turf/open/floor/hybrisa/wood/darkerwood, @@ -125518,11 +125566,11 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 1 }, -/obj/structure/prop/hybrisa/billboardsandsigns/bigbillboards{ +/obj/structure/barricade/handrail/hybrisa/road/plastic/blue, +/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard5{ dir = 8; pixel_y = 34 }, -/obj/structure/barricade/handrail/hybrisa/road/plastic/blue, /turf/open/hybrisa/street/cement1, /area/lv759/outdoors/colony_streets/north_east_street) "rSM" = ( @@ -147570,7 +147618,9 @@ /obj/structure/machinery/microwave{ pixel_y = 18 }, -/obj/item/pizzabox/meat, +/obj/item/pizzabox/pizza_galaxy/meat{ + pixel_y = -6 + }, /turf/open/floor/hybrisa/tile/tilered, /area/lv759/indoors/pizzaria) "uZa" = ( @@ -152320,7 +152370,7 @@ level = 3; pixel_y = 17 }, -/obj/item/pizzabox/mystery/stack, +/obj/item/pizzabox/pizza_galaxy/mystery/stack, /turf/open/floor/hybrisa/tile/cuppajoesfloor, /area/lv759/oob) "vIU" = ( @@ -155914,7 +155964,7 @@ /turf/open/hybrisa/street/asphalt, /area/lv759/oob) "wjg" = ( -/obj/item/pizzabox/margherita, +/obj/item/pizzabox/pizza_galaxy/margherita, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/north_west_street) "wjl" = ( @@ -157515,8 +157565,8 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 1 }, -/obj/structure/prop/hybrisa/billboardsandsigns/billboardsmedium/billboard5{ - dir = 8; +/obj/structure/prop/hybrisa/billboardsandsigns/bigbillboards{ + dir = 10; pixel_y = 32 }, /turf/open/hybrisa/street/cement3, @@ -166086,9 +166136,8 @@ /area/lv759/indoors/spaceport/docking_bay_1) "xFx" = ( /obj/structure/surface/table/reinforced/black, -/obj/item/pizzabox/mystery/stack{ - layer = 7; - pixel_y = 9 +/obj/item/pizzabox/pizza_galaxy/mystery/stack{ + pixel_y = 12 }, /turf/open/floor/hybrisa/metal/zbrownfloor_full, /area/lv759/indoors/meridian/meridian_foyer) @@ -169899,9 +169948,6 @@ /turf/open/auto_turf/hybrisashale/layer1, /area/lv759/indoors/caves/wy_research_complex_entrance) "yiz" = ( -/obj/item/stack/sheet/cardboard{ - layer = 1 - }, /obj/effect/hybrisa/decal/road/lines3, /obj/effect/hybrisa/decal/dirt, /obj/effect/decal/cleanable/blood/oil/streak, @@ -193266,7 +193312,7 @@ raD sGs raD bPR -rAY +cBE sGs raD raD @@ -193518,7 +193564,7 @@ wPZ miD wDB kSi -cNl +pls miD miD miD @@ -224366,7 +224412,7 @@ qsB mfD eIq lXh -rAp +hWx ylY sja qok @@ -226379,7 +226425,7 @@ npx lcW sQK dfX -wwg +lQI aKk pSZ hcI