From 8021f4d3f021f440c933a9eff089ee072b2a3baf Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 4 Mar 2024 19:53:12 -0600 Subject: [PATCH] yea --- .../structures/crates_lockers/closets/wallmount.dm | 8 -------- .../singularity/particle_accelerator/particle_emitter.dm | 2 +- code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 6 +++--- code/modules/projectiles/boxes_magazines/external/toy.dm | 6 +++--- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/wallmount.dm b/code/game/objects/structures/crates_lockers/closets/wallmount.dm index b32f4e006f47..45e45207e96a 100644 --- a/code/game/objects/structures/crates_lockers/closets/wallmount.dm +++ b/code/game/objects/structures/crates_lockers/closets/wallmount.dm @@ -26,14 +26,6 @@ //wardrobes -/obj/structure/closet/wardrobe/wall - wall_mounted = TRUE - anchored = TRUE - density = TRUE - can_be_unanchored = FALSE - icon = 'icons/obj/wallcloset.dmi' - icon_door = "blue_wall" - /obj/structure/closet/wardrobe/pink/wall wall_mounted = TRUE anchored = TRUE diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index fc7cca55e655..15617eca5260 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -2,7 +2,7 @@ name = "EM Containment Grid" desc = "This launches the Alpha particles, might not want to stand near this end." icon = 'icons/obj/machines/particle_accelerator.dmi' - icon_state = "none" + icon_state = "emitter_center" var/fire_delay = 50 var/last_shot = 0 diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index c58035ef95fc..ddc147819f8b 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -96,7 +96,7 @@ /obj/item/ammo_box/a858 name = "stripper clip (8x58mm)" desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration." - icon_state = "858" + icon_state = "enbloc_858" ammo_type = /obj/item/ammo_casing/caseless/a858 max_ammo = 5 multiple_sprites = AMMO_BOX_PER_BULLET @@ -402,7 +402,7 @@ /obj/item/ammo_box/c8x50mm_box name = "ammo box (8x50mm)" desc = "A box of standard 8x50mm ammo." - icon_state = "8x50mm" + icon_state = "8x50mmbox" ammo_type = /obj/item/ammo_casing/a8_50r max_ammo = 50 @@ -430,6 +430,6 @@ /obj/item/ammo_box/c8x50mmhp_box name = "ammo box (8x50mm)" desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of ." - icon_state = "8x50mm-hp" + icon_state = "8x50mmbox-hp" ammo_type = /obj/item/ammo_casing/a8_50rhp max_ammo = 20 diff --git a/code/modules/projectiles/boxes_magazines/external/toy.dm b/code/modules/projectiles/boxes_magazines/external/toy.dm index ab9656cdf111..7ed352a1941a 100644 --- a/code/modules/projectiles/boxes_magazines/external/toy.dm +++ b/code/modules/projectiles/boxes_magazines/external/toy.dm @@ -49,8 +49,8 @@ /obj/item/ammo_box/magazine/toy/m762 name = "donksoft box magazine" desc = "A huge toy LMG magazine designed to fit vast quantities of harmless foam darts." - icon_state = "a850r-toy" - base_icon_state = "a850r" + icon_state = "a762-toy" + base_icon_state = "a762" caliber = "foam_force" ammo_type = /obj/item/ammo_casing/caseless/foam_dart max_ammo = 50 @@ -62,5 +62,5 @@ /obj/item/ammo_box/magazine/toy/m762/riot desc = "A huge toy LMG magazine designed to fit vast quantities of legally-harmless riot control darts." - icon_state = "a850r-riot" + icon_state = "a762-riot" ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot