shiptest-ss13 · MarkSuckerberg · Mar 27, 2024 · Nov 26, 2023 · Nov 26, 2023 · Nov 26, 2023
@@ -165,7 +165,7 @@
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/overmap_encounter/planetoid/cave/explored)
 "bh" = (
-/obj/item/clothing/under/rank/civilian/cookjorts,
+/obj/item/clothing/under/shorts/cookjorts,
 /turf/closed/mineral/random/jungle,
 /area/overmap_encounter/planetoid/cave/explored)
 "bj" = (

@@ -241,7 +241,6 @@
 	},
 /obj/effect/mob_spawn/human/corpse/damaged,
 /obj/item/clothing/under/rank/civilian/chaplain,
-/obj/item/clothing/suit/chaplainsuit/witchhunter,
 /obj/item/clothing/head/helmet/chaplain/witchunter_hat,
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/glass,

@@ -14592,7 +14592,7 @@
 	dir = 8;
 	pixel_x = 28
 	},
-/obj/item/clothing/under/rank/civilian/cookjorts,
+/obj/item/clothing/under/shorts/cookjorts,
 /obj/item/clothing/shoes/cookflops,
 /obj/item/clothing/suit/toggle/chef,
 /obj/item/clothing/under/rank/civilian/chef,

@@ -7779,9 +7779,9 @@
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 9
 	},
-/obj/item/clothing/under/rank/civilian/cookjorts,
-/obj/item/clothing/under/rank/civilian/cookjorts,
-/obj/item/clothing/under/rank/civilian/cookjorts,
+/obj/item/clothing/under/shorts/cookjorts,
+/obj/item/clothing/under/shorts/cookjorts,
+/obj/item/clothing/under/shorts/cookjorts,
 /turf/open/floor/pod/dark,
 /area/ship/cargo)
 "Qg" = (

@@ -4155,7 +4155,7 @@
 	dir = 8;
 	pixel_x = 28
 	},
-/obj/item/clothing/under/rank/civilian/cookjorts,
+/obj/item/clothing/under/shorts/cookjorts,
 /obj/item/clothing/shoes/cookflops,
 /obj/item/clothing/suit/toggle/chef,
 /obj/item/clothing/under/rank/civilian/chef,

diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
@@ -203,7 +203,6 @@
 	name = "krav maga gloves"
 	desc = "These gloves can teach you to perform Krav Maga using nanochips."
 	icon_state = "fightgloves"
-	item_state = "fightgloves"
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
 	heat_protection = HANDS
@@ -214,7 +213,6 @@
 	name = "combat gloves plus"
 	desc = "These tactical gloves are fireproof and electrically insulated, and through the use of nanochip technology will teach you the martial art of krav maga."
 	icon_state = "black"
-	item_state = "blackgloves"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	strip_delay = 80

diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
@@ -1,7 +1,7 @@
 /obj/machinery/door
 	name = "door"
 	desc = "It opens and closes."
-	icon = 'icons/obj/doors/Doorint.dmi'
+	icon = 'icons/obj/doors/doorf.dmi'
 	icon_state = "door1"
 	base_icon_state = "door"
 	opacity = TRUE

diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm
@@ -109,12 +109,12 @@
 /obj/machinery/droneDispenser/swarmer
 	name = "swarmer fabricator"
 	desc = "An alien machine of unknown origin. It whirs and hums with green-blue light, the air above it shimmering."
-	icon = 'icons/obj/machines/gateway.dmi'
-	icon_state = "toffcenter"
-	icon_off = "toffcenter"
-	icon_on = "toffcenter"
-	icon_recharging = "toffcenter"
-	icon_creating = "offcenter"
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "hivebot_fab"
+	icon_off = "hivebot_fab"
+	icon_on = "hivebot_fab"
+	icon_recharging = "hivebot_fab"
+	icon_creating = "hivebot_fab_on"
 	metal_cost = 0
 	glass_cost = 0
 	cooldownTime = 300 //30 seconds

diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
@@ -72,6 +72,7 @@
 	var/original_name
 	desc = "A large piece of space-resistant printed paper."
 	icon = 'icons/obj/contraband.dmi'
+	icon_state = "poster_ripped"
 	anchored = TRUE
 	var/ruined = FALSE
 	/// how do we want to handle the random poster pool? POSTER_SUBTYPES chooses randomly from subtypes, AKA how it was handled before

diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm
@@ -35,12 +35,12 @@
 	random_icon_states = list("gibarm", "gibleg")
 
 /obj/effect/decal/cleanable/robot_debris/up
-	icon_state = "gibup1"
-	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup1","gibup1")
+	icon_state = "gibup"
+	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup","gibup")
 
 /obj/effect/decal/cleanable/robot_debris/down
-	icon_state = "gibdown1"
-	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown1","gibdown1")
+	icon_state = "gibdown"
+	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown","gibdown")
 
 /obj/effect/decal/cleanable/oil
 	name = "motor oil"

diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
@@ -37,6 +37,7 @@ GLOBAL_LIST(gang_tags)
 	name = "Leet Like Jeff K gang tag"
 	desc = "Looks like someone's claimed this area for Leet Like Jeff K."
 	icon = 'icons/obj/gang/tags.dmi'
+	icon_state = "B_tag"
 	layer = BELOW_MOB_LAYER
 	var/datum/team/gang/my_gang
 

diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
@@ -40,7 +40,7 @@
 
 /obj/effect/turf_decal
 	icon = 'icons/turf/decals.dmi'
-	icon_state = "warningline"
+	icon_state = "warningfulltile"
 	plane = FLOOR_PLANE
 	layer = TURF_DECAL_LAYER
 	var/detail_overlay

diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -416,14 +416,6 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
 	icon_state = "plaque"
 	icon = 'icons/turf/decals.dmi'
 
-/obj/effect/turf_decal/asteroid
-	name = "random asteroid rubble"
-	icon_state = "asteroid0"
-
-/obj/effect/turf_decal/asteroid/New()
-	icon_state = "asteroid[rand(0,9)]"
-	..()
-
 /obj/effect/turf_decal/chapel
 	name = "chapel"
 	icon_state = "chapel"

diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
@@ -187,7 +187,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 
 /obj/effect/landmark/start/psychologist
 	name = "Psychologist"
-	icon_state = "Psychologist"
+	icon_state = "Curator"
 
 /obj/effect/landmark/start/chaplain
 	name = "Chaplain"

diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
@@ -1,12 +1,3 @@
-//The effect when you wrap a dead body in gift wrap
-/obj/effect/spresent
-	name = "strange present"
-	desc = "It's a ... present?"
-	icon = 'icons/obj/items_and_weapons.dmi'
-	icon_state = "strangepresent"
-	density = TRUE
-	anchored = FALSE
-
 /obj/effect/beam
 	name = "beam"
 	var/def_zone
@@ -83,7 +74,6 @@
 /obj/effect/abstract/marker/at
 	name = "active turf marker"
 
-
 /obj/effect/dummy/lighting_obj
 	name = "lighting fx obj"
 	desc = "Tell a coder if you're seeing this."

diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -115,17 +115,14 @@
 /obj/effect/temp_visual/dir_setting/wraith
 	name = "shadow"
 	icon = 'icons/mob/mob.dmi'
-	icon_state = "phase_shift2"
+	icon_state = "revenant_idle"
 	duration = 6
 
 /obj/effect/temp_visual/dir_setting/wraith/angelic
-	icon_state = "phase_shift2_angelic"
 
 /obj/effect/temp_visual/dir_setting/wraith/out
-	icon_state = "phase_shift"
 
 /obj/effect/temp_visual/dir_setting/wraith/out/angelic
-	icon_state = "phase_shift_angelic"
 
 /obj/effect/temp_visual/dir_setting/tailsweep
 	icon_state = "tailsweep"
@@ -157,7 +154,7 @@
 	fades = TRUE
 
 /obj/effect/temp_visual/dir_setting/curse/hand
-	icon_state = "cursehand"
+	icon_state = "cursehand0"
 
 /obj/effect/temp_visual/dir_setting/space_wind
 	icon = 'icons/effects/atmospherics.dmi'
@@ -174,7 +171,7 @@
 	name = "\improper Bluespace energy wave"
 	desc = "A massive, rippling wave of bluepace energy, all rapidly exhausting itself the moment it leaves the concentrated beam of light."
 	icon = 'icons/effects/beam_splash.dmi'
-	icon_state = "beam_splash_l"
+	icon_state = "beam_splash_e"
 	layer = ABOVE_ALL_MOB_LAYER
 	pixel_y = -16
 	duration = 50

diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
@@ -6,7 +6,7 @@
 	icon_state = "muzzle_laser"
 
 /obj/effect/projectile/muzzle/laser/blue
-	icon_state = "muzzle_laser_blue"
+	icon_state = "muzzle_blue"
 
 /obj/effect/projectile/muzzle/laser/emitter
 	name = "emitter flash"

diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm
@@ -3,8 +3,6 @@
 	desc = "Used for long-distance surveillance."
 	item_state = "binoculars"
 	icon_state = "binoculars"
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	var/mob/listeningTo

diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm
@@ -147,7 +147,7 @@
 /obj/item/ammo_casing/energy/chrono_beam
 	name = "eradication beam"
 	projectile_type = /obj/projectile/energy/chrono_beam
-	icon_state = "chronobolt"
+	icon_state = "caseless"
 	e_cost = 0
 	var/obj/item/gun/energy/chrono_gun/gun
 

diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
@@ -45,7 +45,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		damtype = "fire"
 		force = 3
 		hitsound = 'sound/items/welder.ogg'
-		item_state = "cigon"
 		name = "lit [initial(name)]"
 		desc = "A [initial(name)]. This one is lit."
 		attack_verb = list("burnt","singed")
@@ -59,7 +58,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		damtype = "brute"
 		force = initial(force)
 		icon_state = "match_burnt"
-		item_state = "cigoff"
 		name = "burnt [initial(name)]"
 		desc = "A [initial(name)]. This one has seen better days."
 		attack_verb = list("flicked")
@@ -116,7 +114,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	desc = "A roll of tobacco and nicotine."
 	icon_state = "cigoff"
 	throw_speed = 0.5
-	item_state = "cigoff"
 	w_class = WEIGHT_CLASS_TINY
 	body_parts_covered = null
 	grind_results = list()
@@ -418,7 +415,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_off = "cigaroff" //make sure to add positional sprites in icons/obj/cigarettes.dmi if you add more.
 	type_butt = /obj/item/cigbutt/cigarbutt
 	throw_speed = 0.5
-	item_state = "cigaroff"
 	smoketime = 300 // 11 minutes
 	chem_volume = 40
 	list_reagents = list(/datum/reagent/drug/nicotine = 25)

diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
@@ -253,7 +253,7 @@
 	name = "banana lamp"
 	desc = "Only a clown would think to make a ghetto banana-shaped lamp. Even has a goofy pullstring."
 	icon_state = "bananalamp"
-	item_state = "bananalamp"
+	item_state = "lampgreen"
 
 // FLARES
 

diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm
@@ -2,7 +2,6 @@
 	name = "pressure plate"
 	desc = "An electronic device that triggers when stepped on. Ctrl-Click to toggle the pressure plate off and on."
 	icon = 'icons/obj/puzzle_small.dmi'
-	item_state = "flash"
 	icon_state = "pressureplate"
 	layer = LOW_OBJ_LAYER
 	var/trigger_mob = TRUE

diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -42,7 +42,7 @@
 
 /obj/item/encryptionkey/minutemen
 	name = "minutemen encryption key"
-	icon_state = "clip_cypherkey"
+	icon_state = "cmm_cypherkey"
 	channels = list(RADIO_CHANNEL_MINUTEMEN = 1)
 
 /obj/item/encryptionkey/inteq
@@ -57,7 +57,7 @@
 
 /obj/item/encryptionkey/headset_com
 	name = "command radio encryption key"
-	icon_state = "comm_cypherkey"
+	icon_state = "com_cypherkey"
 	channels = list(RADIO_CHANNEL_COMMAND = 1)
 
 /obj/item/encryptionkey/heads/captain