Skip to content

Commit

Permalink
yea
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Mar 5, 2024
1 parent 7128c84 commit 8021f4d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions code/modules/projectiles/boxes_magazines/external/toy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 8021f4d

Please sign in to comment.