Merge pull request #16079 from liz-lavenza/cit-fix/more-icons

Fix issues with icons and mail bags
2024-04-16 17:02:49 -04:00
parent 3a054b8349 0b4dcfd73a
commit 4d86abfa4c
15 changed files with 29 additions and 16 deletions
@@ -236,7 +236,7 @@

 /// Subtype that's always junkmail
 /obj/item/mail/junkmail/Initialize()
-	..()
+	. = ..()
 	junk_mail()

 /// Crate for mail from CentCom.
@@ -342,11 +342,11 @@
 	storage.max_combined_w_class = 42
 	storage.max_items = 21
 	storage.display_numerical_stacking = FALSE
-	storage.can_hold = list(
+	storage.can_hold = typecacheof(list(
 		/obj/item/mail,
 		/obj/item/small_delivery,
 		/obj/item/paper
-	)
+	))

 /obj/item/paper/fluff/junkmail_redpill
 	name = "smudged paper"
@@ -623,6 +623,7 @@
 	desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "spbox"
+	illustration = null

 /obj/item/storage/box/snappops/ComponentInitialize()
 	. = ..()
@@ -170,6 +170,7 @@
 	spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
 	custom_price = PRICE_ALMOST_CHEAP
 	var/spawn_coupon = TRUE
+	var/has_open_overlay = TRUE

 /obj/item/storage/fancy/cigarettes/attack_self(mob/user)
 	if(contents.len == 0 && spawn_coupon)
@@ -227,7 +228,8 @@
 	. = ..()
 	if(!fancy_open || !contents.len)
 		return
-	. += "[icon_state]_open"
+	if(has_open_overlay)
+		. += "[icon_state]_open"
 	var/cig_position = 1
 	for(var/C in contents)
 		var/mutable_appearance/inserted_overlay = mutable_appearance(icon)
@@ -436,6 +438,7 @@
 	icon_type = "premium cigar"
 	spawn_type = /obj/item/clothing/mask/cigarette/cigar
 	spawn_coupon = FALSE
+	has_open_overlay = FALSE

 /obj/item/storage/fancy/cigarettes/cigars/ComponentInitialize()
 	. = ..()
@@ -122,6 +122,7 @@
 	icon_state = "mini-uzi"
 	mag_type = /obj/item/ammo_box/magazine/uzim9mm
 	burst_size = 2
+	automatic_burst_overlay = FALSE

 /obj/item/gun/ballistic/automatic/m90
 	name = "\improper M-90gl Carbine"
@@ -277,6 +278,7 @@
 	actions_types = list()
 	spread = 7
 	pin = /obj/item/firing_pin/implant/pindicate
+	automatic_burst_overlay = FALSE
 	var/cover_open = FALSE

 /obj/item/gun/ballistic/automatic/l6_saw/Initialize()
@@ -41,6 +41,7 @@
 	fire_delay = 0
 	fire_select_modes = list(SELECT_SEMI_AUTOMATIC)
 	casing_ejector = FALSE
+	automatic_burst_overlay = FALSE

 /obj/item/gun/ballistic/automatic/gyropistol/update_icon_state()
 	icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
@@ -18,6 +18,7 @@
 	dualwield_spread_mult = 1.4
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_BULKY
+	automatic_burst_overlay = FALSE
 	var/obj/item/stock_parts/cell/cell
 	var/cell_type = /obj/item/stock_parts/cell/magnetic

@@ -128,6 +128,7 @@
 	weapon_weight = WEAPON_MEDIUM
 	dualwield_spread_mult = 1.4
 	w_class = WEIGHT_CLASS_BULKY
+	automatic_burst_overlay = FALSE

 /obj/item/gun/ballistic/shotgun/toy/mag
 	name = "foam force magpistol"
@@ -8,7 +8,7 @@
 	clumsy_check = FALSE
 	item_flags = NEEDS_PERMIT
 	selfcharge = EGUN_SELFCHARGE
-	cell_type = "/obj/item/stock_parts/cell/pulse"
+	cell_type = /obj/item/stock_parts/cell/pulse
 	icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'

 /obj/item/gun/energy/megabuster/proto
@@ -4,7 +4,7 @@
 	icon_state = "xray"
 	w_class = WEIGHT_CLASS_NORMAL
 	ammo_type = list(/obj/item/ammo_casing/energy/plasmagun)
-	cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
+	cell_type = /obj/item/stock_parts/cell/pulse/carbine
 	ammo_x_offset = 2
 	shaded_charge = 1
 	lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
@@ -50,7 +50,7 @@
 	icon_state = "xcomlasergun"
 	item_state = null
 	icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
-	cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
+	cell_type = /obj/item/stock_parts/cell/pulse/carbine
 	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
 	ammo_x_offset = 4
 	lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
@@ -62,7 +62,7 @@
 	icon_state = "LaserAK"
 	item_state = null
 	icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
-	cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
+	cell_type = /obj/item/stock_parts/cell/pulse/carbine
 	ammo_type = list(/obj/item/ammo_casing/energy/laser)
 	ammo_x_offset = 4
 	lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
@@ -9,7 +9,7 @@
 	flags_1 =  CONDUCT_1
 	slot_flags = ITEM_SLOT_BACK
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
-	cell_type = "/obj/item/stock_parts/cell/pulse"
+	cell_type = /obj/item/stock_parts/cell/pulse

 /obj/item/gun/energy/pulse/emp_act(severity)
 	return
@@ -42,7 +42,7 @@
 	slot_flags = ITEM_SLOT_BELT
 	icon_state = "pulse_carbine"
 	item_state = null
-	cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
+	cell_type = /obj/item/stock_parts/cell/pulse/carbine
 	can_flashlight = 1
 	flight_x_offset = 18
 	flight_y_offset = 12
@@ -57,7 +57,7 @@
 	slot_flags = ITEM_SLOT_BELT
 	icon_state = "pulse_pistol"
 	item_state = "gun"
-	cell_type = "/obj/item/stock_parts/cell/pulse/pistol"
+	cell_type = /obj/item/stock_parts/cell/pulse/pistol

 /obj/item/gun/energy/pulse/pistol/loyalpin
 	pin = /obj/item/firing_pin/implant/mindshield
@@ -65,7 +65,7 @@
 /obj/item/gun/energy/pulse/destroyer
 	name = "pulse destroyer"
 	desc = "A heavy-duty energy rifle built for pure destruction."
-	cell_type = "/obj/item/stock_parts/cell/infinite"
+	cell_type = /obj/item/stock_parts/cell/infinite
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse)

 /obj/item/gun/energy/pulse/destroyer/attack_self(mob/living/user)
@@ -76,4 +76,5 @@
 	desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
 	icon_state = "m1911"
 	item_state = "gun"
-	cell_type = "/obj/item/stock_parts/cell/infinite"
+	cell_type = /obj/item/stock_parts/cell/infinite
+	modifystate = FALSE
@@ -57,7 +57,7 @@
 	item_state = "c20r"
 	w_class = WEIGHT_CLASS_BULKY
 	ammo_type = list(/obj/item/ammo_casing/energy/meteor)
-	cell_type = "/obj/item/stock_parts/cell/potato"
+	cell_type = /obj/item/stock_parts/cell/potato
 	clumsy_check = 0 //Admin spawn only, might as well let clowns use it.
 	selfcharge = EGUN_SELFCHARGE

@@ -187,6 +187,7 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/gravity/repulse, /obj/item/ammo_casing/energy/gravity/attract, /obj/item/ammo_casing/energy/gravity/chaos)
 	item_state = "gravity_gun"
 	icon_state = "gravity_gun"
+	automatic_charge_overlays = FALSE
 	var/power = 4
 	var/firing_core = FALSE

@@ -301,7 +302,7 @@
 	desc = "A LMG that fires 3D-printed flechettes. They are slowly resupplied using the cyborg's internal power source."
 	icon_state = "l6closed0"
 	icon = 'icons/obj/guns/projectile.dmi'
-	cell_type = "/obj/item/stock_parts/cell/secborg"
+	cell_type = /obj/item/stock_parts/cell/secborg
 	ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
 	can_charge = 0
 	use_cyborg_cell = 1
@@ -15,6 +15,7 @@
 	fire_delay = 1
 	spread = 30	//should be 40 for XCOM memes, but since its adminspawn only, might as well make it useable
 	recoil = 1
+	automatic_burst_overlay = FALSE

 ///toy memes///

@@ -98,7 +99,7 @@
 	wound_bonus = 15
 	sharpness = SHARP_EDGED
 	wound_falloff_tile = 0
-	
+
 ///ammo casings (CASELESS AMMO CASINGS WOOOOOOOO)///

 /obj/item/ammo_casing/caseless/flechetteap
@@ -271,3 +272,4 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	burst_size = 4	//Shh.
 	fire_delay = 1
+	automatic_burst_overlay = FALSE