Refinery Tweaks (#1668)

MY SINCLAIR??? resprites N-corp armors Boxes for Rosespanner and N-corp containing seals Changes rates to 60% gears, 40% loot for Rosespanner Changes rates to 55% seals, 45% loot for N-corp N-corp and Rosespanner PE sale now costs 1:1 ego_hat helmet subtype new var: perma, makes the ego hat not kill itself Kcorp L1 uniform box changes to ego_hat applied accross the board new item, ego_neck adding manifesting ego neckwear re worded so that city armor doesn't say "MANIFEST YOUR NON EXITENT EGO ARMORS HAT" refactor to allow more drip/accessories in the future a fuckup of stellar porportions changes
vlggms · Dec 1, 2023 · 30a2517 · 30a2517
1 parent 658d9b2
commit 30a2517
Show file tree

Hide file tree

Showing 29 changed files with 264 additions and 89 deletions.
diff --git a/ModularTegustation/tegu_items/refinery/boxes.dm b/ModularTegustation/tegu_items/refinery/boxes.dm
@@ -0,0 +1,76 @@
+// Stores small boxes to be used in the Refinery.
+
+
+// Rosespanner gears, 6 per
+/obj/item/storage/box/rosespanner
+	name = "Rosespanner Gears box"
+	desc = "A small box containing 6 RED gears from the Rosespanner workshop."
+
+/obj/item/storage/box/rosespanner/PopulateContents()
+	for(var/i = 1 to 6)
+		new /obj/item/rosespanner_gear(src)
+
+/obj/item/storage/box/rosespanner/white
+	desc = "A small box containing 6 WHITE gears from the Rosespanner workshop."
+
+/obj/item/storage/box/rosespanner/white/PopulateContents()
+	for(var/i = 1 to 6)
+		new /obj/item/rosespanner_gear/white(src)
+
+/obj/item/storage/box/rosespanner/black
+	desc = "A small box containing 6 BLACK gears from the Rosespanner workshop."
+
+/obj/item/storage/box/rosespanner/black/PopulateContents()
+	for(var/i = 1 to 6)
+		new /obj/item/rosespanner_gear/black(src)
+
+/obj/item/storage/box/rosespanner/pale
+	desc = "A small box containing 6 PALE gears from the Rosespanner workshop."
+
+/obj/item/storage/box/rosespanner/pale/PopulateContents()
+	for(var/i = 1 to 6)
+		new /obj/item/rosespanner_gear/pale(src)
+
+// N-corp boxes
+/obj/item/storage/box/ncorp_seals
+	name = "Ncorp Seals box"
+	desc = "A small box containing 6 RED seals from Nagel Und Hammer."
+
+/obj/item/storage/box/ncorp_seals/PopulateContents()
+	for(var/i = 1 to 6)
+		new /obj/item/ego_weapon/city/ncorp_mark(src)
+
+/obj/item/storage/box/ncorp_seals/white
+	desc = "A small box containing 6 WHITE seals from Nagel Und Hammer."
+
+/obj/item/storage/box/ncorp_seals/white/PopulateContents()
+	for(var/i = 1 to 6)
+		new /obj/item/ego_weapon/city/ncorp_mark/white(src)
+
+/obj/item/storage/box/ncorp_seals/black
+	desc = "A small box containing 6 BLACK seals from Nagel Und Hammer."
+
+/obj/item/storage/box/ncorp_seals/black/PopulateContents()
+	for(var/i = 1 to 6)
+		new /obj/item/ego_weapon/city/ncorp_mark/black(src)
+
+/obj/item/storage/box/ncorp_seals/pale
+	desc = "A small box containing 6 PALE seals from Nagel Und Hammer."
+
+/obj/item/storage/box/ncorp_seals/pale/PopulateContents()
+	for(var/i = 1 to 6)
+		new /obj/item/ego_weapon/city/ncorp_mark/pale(src)
+
+// K-corp uniform boxes
+/obj/item/storage/box/kcorp_armor
+	name = "K-corp L1 Uniform box"
+	desc = "A small box issued to K-corp's L1 employees."
+
+/obj/item/storage/box/kcorp_armor/PopulateContents()
+	var/loot_list = list(
+		/obj/item/clothing/head/ego_hat/helmet/kcorp,
+		/obj/item/clothing/head/ego_hat/helmet/kcorp/visor
+	)
+	var/loot = pick(loot_list)
+	new /obj/item/clothing/suit/armor/ego_gear/city/kcorp_l1(src)
+	new loot(src)
diff --git a/ModularTegustation/tegu_items/refinery/crates/corporation.dm b/ModularTegustation/tegu_items/refinery/crates/corporation.dm
@@ -46,9 +46,7 @@
 		/obj/item/ego_weapon/shield/kcorp,
 		/obj/item/ego_weapon/city/kcorp/axe,
 		/obj/item/gun/ego_gun/pistol/kcorp,
-		/obj/item/clothing/suit/armor/ego_gear/city/kcorp_l1,
-		/obj/item/clothing/head/kcorp,
-		/obj/item/clothing/head/kcorp/visor,
+		/obj/item/storage/box/kcorp_armor,
 		)
 
 	veryrareloot =	list(
@@ -67,15 +65,15 @@
 	name = "N Corp Crate"
 	desc = "A crate recieved from N-Corp. Open with a Crowbar."
 	icon_state = "crate_ncorp"
+	rarechance = 65 // 30% seals, 70% everything else
 	veryrarechance = 5
 	lootlist =	list(
-		/obj/item/ego_weapon/city/ncorp_mark,
-		/obj/item/ego_weapon/city/ncorp_mark/white,
-		/obj/item/ego_weapon/city/ncorp_mark/black,
+		/obj/item/storage/box/ncorp_seals,
+		/obj/item/storage/box/ncorp_seals/white,
+		/obj/item/storage/box/ncorp_seals/black,
 		)
 
 	rareloot =	list(
-		/obj/item/ego_weapon/city/ncorp_mark/pale,
 		/obj/item/ego_weapon/city/ncorp_nail,
 		/obj/item/ego_weapon/city/ncorp_nail/big,
 		/obj/item/ego_weapon/city/ncorp_brassnail,
@@ -87,6 +85,7 @@
 		)
 
 	veryrareloot =	list(
+		/obj/item/storage/box/ncorp_seals/pale,
 		/obj/item/ego_weapon/city/ncorp_hammer/hand,
 		/obj/item/ego_weapon/city/ncorp_hammer/grippy,
 		/obj/item/ego_weapon/city/ncorp_nail/huge,
@@ -156,7 +155,7 @@
 	icon_state = "crate_wcorp"
 	lootlist =	list(
 		/obj/item/ego_weapon/city/charge/wcorp,
-		/obj/item/clothing/head/wcorp,
+		/obj/item/clothing/head/ego_hat/wcorp,
 		/obj/item/clothing/under/suit/lobotomy/wcorp,
 		/obj/item/clothing/suit/armor/ego_gear/wcorp,
 		/obj/item/powered_gadget/teleporter,

diff --git a/ModularTegustation/tegu_items/refinery/crates/workshop.dm b/ModularTegustation/tegu_items/refinery/crates/workshop.dm
@@ -102,10 +102,12 @@
 	name = "rosespanner workshop crate"
 	desc = "A crate recieved from the rosespanner workshop. Open with a Crowbar."
 	icon_state = "crate_rosespanner"
+	rarechance = 65	// 30% for gears, 70% everything else
+	veryrarechance = 5
 	lootlist =	list(
-		/obj/item/rosespanner_gear,
-		/obj/item/rosespanner_gear/white,
-		/obj/item/rosespanner_gear/black,
+		/obj/item/storage/box/rosespanner,
+		/obj/item/storage/box/rosespanner/white,
+		/obj/item/storage/box/rosespanner/black,
 		)
 
 	rareloot =	list(
@@ -114,5 +116,8 @@
 		/obj/item/ego_weapon/city/charge/rosespanner/minihammer,
 		/obj/item/clothing/suit/armor/ego_gear/city/rosespannerrep,
 		/obj/item/clothing/suit/armor/ego_gear/city/rosespanner,
-		/obj/item/rosespanner_gear/pale,
 		)
+
+	veryrareloot =	list(
+		/obj/item/storage/box/rosespanner/pale,
+	)
diff --git a/ModularTegustation/tegu_items/refinery/sales.dm b/ModularTegustation/tegu_items/refinery/sales.dm
@@ -105,7 +105,6 @@
 	desc = "A machine used to send PE to N-Corp."
 	icon_state = "machinen"
 	crate = /obj/structure/lootcrate/n_corp
-	crate_timer = 60
 
 /obj/structure/pe_sales/leaflet
 	name = "Leaflet Workshop Power Input"
@@ -130,7 +129,6 @@
 	desc = "A machine used to send PE to the rosespanner workshop"
 	icon_state = "machinerosespanner"
 	crate = /obj/structure/lootcrate/workshoprosespanner
-	crate_timer = 60
 
 /obj/structure/pe_sales/hana
 	name = "Hana Assocation Power Input"

diff --git a/ModularTegustation/tegu_items/representative/console.dm b/ModularTegustation/tegu_items/representative/console.dm
@@ -197,7 +197,7 @@
 			CustomizeOffice(/obj/structure/sign/departments/w_corp, /obj/structure/pe_sales/w_corp)
 			order_list = list(
 				new /datum/data/extraction_cargo("W Corp Cleanup Outfit", /obj/item/clothing/under/suit/lobotomy/wcorp, 100, W_CORP_REP) = 1,
-				new /datum/data/extraction_cargo("W Corp Hat", /obj/item/clothing/head/wcorp, 100, W_CORP_REP) = 1,
+				new /datum/data/extraction_cargo("W Corp Hat", /obj/item/clothing/head/ego_hat/wcorp, 100, W_CORP_REP) = 1,
 				new /datum/data/extraction_cargo("W Corp Cleanup Baton", /obj/item/ego_weapon/city/charge/wcorp, 500, W_CORP_REP) = 1,
 				new /datum/data/extraction_cargo("W Corp Armor Vest", /obj/item/clothing/suit/armor/ego_gear/wcorp, 700, W_CORP_REP) = 1,
 				)

diff --git a/ModularTegustation/tegu_items/representative/outfits.dm b/ModularTegustation/tegu_items/representative/outfits.dm
@@ -10,7 +10,7 @@
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/color/black
 	implants = list(/obj/item/organ/cyberimp/eyes/hud/security)
-	head = /obj/item/clothing/head/wcorp
+	head = /obj/item/clothing/head/ego_hat/wcorp
 	suit = /obj/item/clothing/suit/armor/ego_gear/wcorp/ert
 	belt = /obj/item/ego_weapon/city/charge/wcorp
 

diff --git a/code/modules/clothing/head/_ego_head.dm b/code/modules/clothing/head/_ego_head.dm
@@ -0,0 +1,29 @@
+// EGO hat type, attached to whatever armor that manifests it.
+/obj/item/clothing/head/ego_hat
+	name = "ego hat"
+	desc = "an ego hat that you shouldn't be seeing!"
+	icon = 'icons/obj/clothing/ego_gear/head.dmi'
+	worn_icon = 'icons/mob/clothing/ego_gear/head.dmi'
+	icon_state = ""
+	flags_inv = HIDEMASK
+	var/perma = FALSE // So we can stack all LC13 related hats under the same obj path
+
+/obj/item/clothing/head/ego_hat/Destroy()
+	if(perma)
+		return ..()
+	dropped()
+	return ..()
+
+/obj/item/clothing/head/ego_hat/equipped(mob/user, slot)
+	if(perma)
+		return ..()
+	if(slot != ITEM_SLOT_HEAD)
+		Destroy()
+		return
+	. = ..()
+
+/obj/item/clothing/head/ego_hat/helmet // Subtype to cover the entire head
+	flags_inv = HIDEHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
+	dynamic_hair_suffix = ""
+	dynamic_fhair_suffix = ""
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
@@ -489,21 +489,3 @@
 	flags_inv = 0
 	armor = list(MELEE = 30, BULLET = 15, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
 	strip_delay = 140
-
-/obj/item/clothing/head/ego_hat
-	name = "ego hat"
-	desc = "an ego hat that you shouldn't be seeing!"
-	icon = 'icons/obj/clothing/ego_gear/head.dmi'
-	worn_icon = 'icons/mob/clothing/ego_gear/head.dmi'
-	icon_state = ""
-	flags_inv = HIDEMASK
-
-/obj/item/clothing/head/ego_hat/Destroy()
-	dropped()
-	return ..()
-
-/obj/item/clothing/head/ego_hat/equipped(mob/user, slot)
-	if(slot != ITEM_SLOT_HEAD)
-		Destroy()
-		return
-	. = ..()
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
@@ -274,3 +274,26 @@
 	name = "LCB tie"
 	desc = "It's just a tie."
 	icon_state = "lcb_tie"
+
+// EGO neckwear
+/obj/item/clothing/neck/ego_neck
+	name = "ego neckwear"
+	desc = "an ego neckwear that you shouldn't be seeing!"
+	icon = 'icons/obj/clothing/ego_gear/neck.dmi'
+	worn_icon = 'icons/mob/clothing/ego_gear/neck.dmi'
+	icon_state = ""
+	var/perma = FALSE
+
+/obj/item/clothing/neck/ego_neck/Destroy()
+	if(perma)
+		return ..()
+	dropped()
+	return ..()
+
+/obj/item/clothing/neck/ego_neck/equipped(mob/user, slot)
+	if(perma)
+		return ..()
+	if(slot != ITEM_SLOT_NECK)
+		Destroy()
+		return
+	. = ..()
diff --git a/code/modules/clothing/suits/ego_gear/_ego_gear.dm b/code/modules/clothing/suits/ego_gear/_ego_gear.dm
@@ -13,16 +13,20 @@
 	drag_slowdown = 1
 	var/equip_slowdown = 3 SECONDS
 
-	var/obj/item/clothing/head/ego_hat/hat = null // Hat type, see clothing/head/misc.dm
+	var/obj/item/clothing/head/ego_hat/hat = null // Hat type, see clothing/head/_ego_head.dm
+	var/obj/item/clothing/neck/ego_neck/neck = null // Neckwear, see clothing/neck/_neck.dm
 	var/list/attribute_requirements = list()
 
 /obj/item/clothing/suit/armor/ego_gear/Initialize()
 	. = ..()
-	if(isnull(hat))
-		return
-	var/obj/effect/proc_holder/ability/hat_ability/HA = new(null, hat)
-	var/datum/action/spell_action/ability/item/H = HA.action
-	H.SetItem(src)
+	if(hat)
+		var/obj/effect/proc_holder/ability/hat_ability/HA = new(null, hat)
+		var/datum/action/spell_action/ability/item/H = HA.action
+		H.SetItem(src)
+	if(neck)
+		var/obj/effect/proc_holder/ability/neck_ability/NA = new(null, neck)
+		var/datum/action/spell_action/ability/item/N = NA.action
+		N.SetItem(src)
 
 /obj/item/clothing/suit/armor/ego_gear/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
 	if(!ishuman(M))
@@ -44,21 +48,29 @@
 	. = ..()
 	if(slot == ITEM_SLOT_OCLOTHING)
 		return
-	if(isnull(hat))
-		return
-	var/obj/item/clothing/head/headgear = user.get_item_by_slot(ITEM_SLOT_HEAD)
-	if(!istype(headgear, hat))
-		return
-	headgear.Destroy()
+	if(hat)
+		var/obj/item/clothing/head/headgear = user.get_item_by_slot(ITEM_SLOT_HEAD)
+		if(!istype(headgear, hat))
+			return
+		headgear.Destroy()
+	if(neck)
+		var/obj/item/clothing/neck/neckwear = user.get_item_by_slot(ITEM_SLOT_NECK)
+		if(!istype(neckwear, neck))
+			return
+		neckwear.Destroy()
 
 /obj/item/clothing/suit/armor/ego_gear/dropped(mob/user)
 	. = ..()
-	if(isnull(hat))
-		return
-	var/obj/item/clothing/head/headgear = user.get_item_by_slot(ITEM_SLOT_HEAD)
-	if(!istype(headgear, hat))
-		return
-	headgear.Destroy()
+	if(hat)
+		var/obj/item/clothing/head/headgear = user.get_item_by_slot(ITEM_SLOT_HEAD)
+		if(!istype(headgear, hat))
+			return
+		headgear.Destroy()
+	if(neck)
+		var/obj/item/clothing/neck/neckwear = user.get_item_by_slot(ITEM_SLOT_NECK)
+		if(!istype(neckwear, neck))
+			return
+		neckwear.Destroy()
 
 /obj/item/clothing/suit/armor/ego_gear/proc/CanUseEgo(mob/living/carbon/human/user)
 	if(!ishuman(user))

diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/_cityarmor.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/_cityarmor.dm
@@ -1,4 +1,3 @@
 /obj/item/clothing/suit/armor/ego_gear/city
 	icon = 'icons/obj/clothing/ego_gear/lc13_armor.dmi'
 	worn_icon = 'icons/mob/clothing/ego_gear/lc13_armor.dmi'
-
diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/jcorp.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/jcorp.dm
@@ -60,19 +60,15 @@
 	desc = "The outfit of the Los Mariachis leader. No one has seen this and lived."
 	icon_state = "aida_boss"
 	armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 30)
-	hat = /obj/item/clothing/head/ego_hat/aida_hat_boss
+	hat = /obj/item/clothing/head/ego_hat/helmet/aida_hat_boss
 	attribute_requirements = list(
 							FORTITUDE_ATTRIBUTE = 80,
 							PRUDENCE_ATTRIBUTE = 80,
 							TEMPERANCE_ATTRIBUTE = 80,
 							JUSTICE_ATTRIBUTE = 80
 							)
 
-/obj/item/clothing/head/ego_hat/aida_hat_boss
+/obj/item/clothing/head/ego_hat/helmet/aida_hat_boss
 	name = "los mariachis sombrero"
 	desc = "A sombrero worn by the Los Mariachis leader. This one has a glowing mask of a skull."
 	icon_state = "aida_boss"
-	flags_inv = HIDEHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
-	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
-	dynamic_hair_suffix = ""
-	dynamic_fhair_suffix = ""