new sprites, billboards & pizza related stuff added. Minor map fixes.…

… Minor survivor changes.
cmss13-devs · Jun 25, 2024 · 7bc1217 · 7bc1217
1 parent 6169779
commit 7bc1217
Show file tree

Hide file tree

Showing 10 changed files with 239 additions and 146 deletions.
diff --git 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
@@ -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
@@ -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,16 +218,15 @@
 			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)
 			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/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
diff --git a/icons/obj/structures/props/32x64_hybrisabillboards.dmi b/icons/obj/structures/props/32x64_hybrisabillboards.dmi
diff --git a/icons/obj/structures/props/hybrisa_vehicles/box_van_pizza.dmi b/icons/obj/structures/props/hybrisa_vehicles/box_van_pizza.dmi
diff --git a/icons/obj/vehicles/box_van.dmi b/icons/obj/vehicles/box_van.dmi
diff --git a/icons/obj/vehicles/pizza_van.dmi b/icons/obj/vehicles/pizza_van.dmi
diff --git 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{