diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index f0228535065..ba43942c836 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -250,7 +250,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun name = "syringe gun" desc = "Exosuit-mounted chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur. (Can be attached to: Medical Exosuits)" - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/launcher.dmi' icon_state = "syringegun" var/list/syringes var/list/known_reagents diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b47f19e49fe..dadd7680717 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -137,7 +137,7 @@ /obj/item/toy/crossbow name = "foam dart crossbow" desc = "A weapon favored by many overactive children. Ages 8 and up." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/energy.dmi' icon_state = "crossbow" item_icons = list( icon_l_hand = 'icons/mob/items/lefthand_guns.dmi', diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm index 8d5ce3ff41f..5cc62871848 100644 --- a/code/game/objects/random/guns_and_ammo.dm +++ b/code/game/objects/random/guns_and_ammo.dm @@ -1,7 +1,7 @@ /obj/random/gun/random name = "Random Weapon" desc = "This is a random energy or ballistic weapon." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/energy.dmi' icon_state = "energystun100" /obj/random/gun/random/item_to_spawn() @@ -11,7 +11,7 @@ /obj/random/energy name = "Random Energy Weapon" desc = "This is a random weapon." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/energy.dmi' icon_state = "energykill100" /obj/random/energy/item_to_spawn() @@ -37,7 +37,7 @@ /obj/random/energy/sec name = "Random Security Energy Weapon" desc = "This is a random security weapon." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/energy.dmi' icon_state = "energykill100" /obj/random/energy/sec/item_to_spawn() @@ -47,7 +47,7 @@ /obj/random/projectile name = "Random Projectile Weapon" desc = "This is a random projectile weapon." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "revolver" /obj/random/projectile/item_to_spawn() @@ -94,7 +94,7 @@ /obj/random/projectile/sec name = "Random Security Projectile Weapon" desc = "This is a random security weapon." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "revolver" /obj/random/projectile/sec/item_to_spawn() @@ -105,7 +105,7 @@ /obj/random/projectile/shotgun name = "Random Projectile Weapon" desc = "This is a random projectile weapon." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "shotgun" /obj/random/projectile/item_to_spawn() @@ -118,7 +118,7 @@ /obj/random/handgun name = "Random Handgun" desc = "This is a random sidearm." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "secgundark" /obj/random/handgun/item_to_spawn() @@ -137,7 +137,7 @@ /obj/random/handgun/sec name = "Random Security Handgun" desc = "This is a random security sidearm." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "secgundark" /obj/random/handgun/sec/item_to_spawn() @@ -164,7 +164,7 @@ /obj/random/projectile/random name = "Random Projectile Weapon" desc = "This is a random weapon." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "revolver" /obj/random/projectile/random/item_to_spawn() @@ -176,7 +176,7 @@ /obj/random/multiple/gun/projectile/smg name = "random smg projectile gun" desc = "Loot for PoIs." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "saber" /obj/random/multiple/gun/projectile/smg/item_to_spawn() @@ -210,7 +210,7 @@ /obj/random/multiple/gun/projectile/rifle name = "random rifle projectile gun" desc = "Loot for PoIs." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "carbine" //Concerns about the bullpup, but currently seems to be only a slightly stronger z8. But we shall see. @@ -252,7 +252,7 @@ /obj/random/multiple/gun/projectile/handgun name = "random handgun projectile gun" desc = "Loot for PoIs." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "revolver" /obj/random/multiple/gun/projectile/handgun/item_to_spawn() @@ -394,7 +394,7 @@ /obj/random/multiple/gun/projectile/shotgun name = "random shotgun projectile gun" desc = "Loot for PoIs." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "shotgun" /obj/random/multiple/gun/projectile/shotgun/item_to_spawn() diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm index c385d781215..8362073d531 100644 --- a/code/game/objects/random/mob_vr.dm +++ b/code/game/objects/random/mob_vr.dm @@ -1,7 +1,7 @@ /obj/random/weapon // For Gateway maps and Syndicate. Can possibly spawn almost any gun in the game. name = "Random Illegal Weapon" desc = "This is a random illegal weapon." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' icon_state = "p08" spawn_nothing_percentage = 50 item_to_spawn() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm deleted file mode 100644 index 8cd7bd94fee..00000000000 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ /dev/null @@ -1,215 +0,0 @@ -/obj/structure/closet/secure_closet/hos - name = "head of security's attire" - icon_state = "hossecure1" - icon_closed = "hossecure" - icon_locked = "hossecure1" - icon_opened = "hossecureopen" - icon_broken = "hossecurebroken" - icon_off = "hossecureoff" - req_access = list(access_hos) - storage_capacity = 2.5 * MOB_MEDIUM - - starts_with = list( - /obj/item/clothing/head/helmet/HoS, - /obj/item/clothing/head/helmet/HoS/hat, - /obj/item/clothing/suit/storage/vest/hos, - /obj/item/clothing/under/rank/head_of_security/jensen, - /obj/item/clothing/under/rank/head_of_security/corp, - /obj/item/clothing/under/solgov/mildress/marine/command, - /obj/item/clothing/suit/storage/vest/hoscoat/jensen, - /obj/item/clothing/suit/storage/vest/hoscoat, - /obj/item/clothing/suit/dress/marine/command/hos, - /obj/item/clothing/head/helmet/dermal, - /obj/item/radio/headset/heads/hos, - /obj/item/radio/headset/heads/hos/alt, - /obj/item/clothing/glasses/sunglasses/sechud, - /obj/item/storage/belt/security, - /obj/item/clothing/accessory/holster/waist, - /obj/item/clothing/head/beret/sec/corporate/hos, - /obj/item/clothing/suit/storage/hooded/wintercoat/security, - /obj/item/clothing/mask/gas/half, - /obj/item/clothing/under/bodysuit/bodysuitseccom) - -/obj/structure/closet/secure_closet/hos2 - name = "head of security's gear" - icon_state = "hossecure1" - icon_closed = "hossecure" - icon_locked = "hossecure1" - icon_opened = "hossecureopen" - icon_broken = "hossecurebroken" - icon_off = "hossecureoff" - req_access = list(access_hos) - storage_capacity = 2.5 * MOB_MEDIUM - - // citadel edit NSFW > Multiphase - starts_with = list( - /obj/item/cartridge/hos, - /obj/item/barrier_tape_roll/police, - /obj/item/shield/riot/tele, - /obj/item/storage/box/holobadge/hos, - /obj/item/clothing/accessory/badge/holo/hos, - /obj/item/reagent_containers/spray/pepper, - /obj/item/tool/crowbar/red, - /obj/item/storage/box/flashbangs, - /obj/item/storage/box/firingpins, - /obj/item/flash, - /obj/item/melee/baton/loaded, - /obj/item/gun/energy/gun/multiphase, - /obj/item/melee/telebaton, - /obj/item/clothing/head/beret/sec/corporate/hos, - /obj/item/clothing/suit/storage/hooded/wintercoat/security, - /obj/item/clothing/shoes/boots/winter/security, - /obj/item/gps/security/hos, - /obj/item/flashlight/maglight) - -//Custom NT Security Lockers, Only found at central command -/obj/structure/closet/secure_closet/nanotrasen_security - name = "NanoTrasen security officer's locker" - icon = 'icons/obj/closet_vr.dmi' - icon_state = "secC1" - icon_closed = "secC" - icon_locked = "secC1" - icon_opened = "secCopen" - icon_broken = "secCbroken" - icon_off = "seCcoff" - req_access = list(access_brig) - storage_capacity = 3.5 * MOB_MEDIUM - - starts_with = list( - /obj/item/clothing/under/bodysuit/bodysuitsecweewoo, - /obj/item/clothing/suit/storage/vest/nanotrasen, - /obj/item/clothing/head/helmet, - /obj/item/cartridge/security, - /obj/item/radio/headset/headset_sec, - /obj/item/radio/headset/headset_sec/alt, - /obj/item/storage/belt/security, - /obj/item/flash, - /obj/item/reagent_containers/spray/pepper, - /obj/item/grenade/flashbang, - /obj/item/melee/baton/loaded, - /obj/item/clothing/glasses/sunglasses/sechud, - /obj/item/barrier_tape_roll/police, - /obj/item/hailer, - /obj/item/flashlight/flare, - /obj/item/clothing/accessory/storage/black_vest, - /obj/item/gun/energy/taser, - /obj/item/cell/device/weapon, - /obj/item/flashlight/maglight, - /obj/item/clothing/head/soft/nanotrasen, - /obj/item/clothing/head/beret/nanotrasen, - /obj/item/clothing/under/nanotrasen/security, - /obj/item/clothing/gloves/black, - /obj/item/clothing/shoes/boots/jackboots, - /obj/item/clothing/shoes/boots/jackboots/toeless) - -/obj/structure/closet/secure_closet/nanotrasen_security/Initialize() - if(prob(25)) - starts_with += /obj/item/storage/backpack/security - else - starts_with += /obj/item/storage/backpack/satchel/sec - if(prob(75)) - starts_with += /obj/item/storage/backpack/dufflebag/sec - return ..() - -/obj/structure/closet/secure_closet/nanotrasen_commander - name = "NanoTrasen commander's locker" - icon = 'icons/obj/closet_vr.dmi' - icon_state = "secC1" - icon_closed = "secC" - icon_locked = "secC1" - icon_opened = "secCopen" - icon_broken = "secCbroken" - icon_off = "seCcoff" - req_access = list(access_brig) - storage_capacity = 3.5 * MOB_MEDIUM - - starts_with = list( - /obj/item/clothing/head/helmet/HoS, - /obj/item/clothing/suit/storage/vest/hos, - /obj/item/clothing/under/rank/head_of_security/jensen, - /obj/item/clothing/suit/storage/vest/hoscoat/jensen, - /obj/item/clothing/suit/storage/vest/hoscoat, - /obj/item/clothing/head/helmet/dermal, - /obj/item/cartridge/hos, - /obj/item/radio/headset/heads/hos, - /obj/item/radio/headset/heads/hos/alt, - /obj/item/clothing/glasses/sunglasses/sechud, - /obj/item/barrier_tape_roll/police, - /obj/item/shield/riot, - /obj/item/shield/riot/tele, - /obj/item/storage/box/holobadge/hos, - /obj/item/clothing/accessory/badge/holo/hos, - /obj/item/reagent_containers/spray/pepper, - /obj/item/tool/crowbar/red, - /obj/item/storage/box/flashbangs, - /obj/item/storage/belt/security, - /obj/item/flash, - /obj/item/melee/baton/loaded, - /obj/item/gun/energy/gun, - /obj/item/cell/device/weapon, - /obj/item/clothing/accessory/holster/waist, - /obj/item/melee/telebaton, - /obj/item/clothing/head/beret/sec/corporate/hos, - /obj/item/flashlight/maglight, - /obj/item/clothing/gloves/black, - /obj/item/clothing/shoes/boots/jackboots, - /obj/item/clothing/shoes/boots/jackboots/toeless, - /obj/item/clothing/under/nanotrasen/security/commander) - -/obj/structure/closet/secure_closet/nanotrasen_commander/Initialize() - if(prob(25)) - starts_with += /obj/item/storage/backpack/security - else - starts_with += /obj/item/storage/backpack/satchel/sec - if(prob(75)) - starts_with += /obj/item/storage/backpack/dufflebag/sec - return ..() - -/obj/structure/closet/secure_closet/nanotrasen_warden - name = "NanoTrasen warden's locker" - icon = 'icons/obj/closet_vr.dmi' - icon_state = "secC1" - icon_closed = "secC" - icon_locked = "secC1" - icon_opened = "secCopen" - icon_broken = "secCbroken" - icon_off = "seCcoff" - req_access = list(access_brig) - storage_capacity = 3.5 * MOB_MEDIUM - - starts_with = list( - /obj/item/clothing/suit/storage/vest/warden, - /obj/item/clothing/under/nanotrasen/security/warden, - /obj/item/clothing/suit/storage/vest/wardencoat/alt, - /obj/item/clothing/head/helmet/warden, - /obj/item/cartridge/security, - /obj/item/radio/headset/headset_sec, - /obj/item/radio/headset/headset_sec/alt, - /obj/item/clothing/glasses/sunglasses/sechud, - /obj/item/barrier_tape_roll/police, - /obj/item/clothing/accessory/badge/holo/warden, - /obj/item/storage/box/flashbangs, - /obj/item/storage/box/firingpins, - /obj/item/storage/belt/security, - /obj/item/reagent_containers/spray/pepper, - /obj/item/melee/baton/loaded, - /obj/item/gun/energy/gun, - /obj/item/cell/device/weapon, - /obj/item/storage/box/holobadge, - /obj/item/clothing/head/beret/sec/corporate/warden, - /obj/item/flashlight/maglight, - /obj/item/megaphone, - /obj/item/clothing/gloves/black, - /obj/item/clothing/shoes/boots/jackboots, - /obj/item/clothing/shoes/boots/jackboots/toeless) - -/obj/structure/closet/secure_closet/nanotrasen_warden/Initialize() - if(prob(25)) - new /obj/item/storage/backpack/security(src) - else - new /obj/item/storage/backpack/satchel/sec(src) - if(prob(75)) - new /obj/item/storage/backpack/dufflebag/sec(src) - return ..() - -//Mark for merge with security.dm and deletion later. Unknown conflict emerged this time. diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 22aaa358ed3..20604be7bb9 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -50,7 +50,7 @@ mob/living/carbon/proc/handle_hallucinations() halitem.hud_layerise() switch(rand(1,6)) if(1) //revolver - halitem.icon = 'icons/obj/gun.dmi' + halitem.icon = 'icons/obj/gun/ballistic.dmi' halitem.icon_state = "revolver" halitem.name = "Revolver" if(2) //c4 diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm index 0e8699f9928..ab001286281 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm @@ -189,7 +189,7 @@ halitem.layer = 50 switch(rand(1,6)) if(1) //revolver - halitem.icon = 'icons/obj/gun.dmi' + halitem.icon = 'icons/obj/gun/ballistic.dmi' halitem.icon_state = "revolver" halitem.name = "Revolver" if(2) //c4 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index a51b1a58756..c74e60bd01a 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -31,7 +31,7 @@ /obj/item/gun name = "gun" desc = "Its a gun. It's pretty terrible, though." - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/gun/ballistic.dmi' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi', diff --git a/code/modules/vore/fluffstuff/custom_guns.dm b/code/modules/vore/fluffstuff/custom_guns.dm index 293c88c9d0a..14817992020 100644 --- a/code/modules/vore/fluffstuff/custom_guns.dm +++ b/code/modules/vore/fluffstuff/custom_guns.dm @@ -798,7 +798,7 @@ END OF CITADEL CHANGES */ /obj/item/gun/energy/frontier/locked/holdout name = "holdout frontier phaser" desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." - icon = 'icons/obj/gun_vr.dmi' + icon = 'icons/obj/gun/energy.dmi' icon_state = "holdoutkill" item_state = null phase_power = 100 diff --git a/vorestation.dme b/vorestation.dme index 049df1f00ab..23da0762f11 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1323,7 +1323,6 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\security_vr.dm" #include "code\game\objects\structures\flora\grass.dm" #include "code\game\objects\structures\flora\trees.dm" #include "code\game\objects\structures\ghost_pods\ghost_pods.dm"