diff --git a/maps/torch/items/clothing/solgov-accessory.dm b/maps/torch/items/clothing/solgov-accessory.dm index 7a7e44c872f90..a595f1d4463eb 100644 --- a/maps/torch/items/clothing/solgov-accessory.dm +++ b/maps/torch/items/clothing/solgov-accessory.dm @@ -541,7 +541,7 @@ department tags on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/command/army - icon_state = "dept_army" + icon_state = "dept_marine" desc = "Insignia denoting assignment to the command department. These fit Army uniforms." on_rolled = list("down" = "none") @@ -559,7 +559,7 @@ department tags on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/engineering/army - icon_state = "dept_army" + icon_state = "dept_marine" desc = "Insignia denoting assignment to the engineering department. These fit Army uniforms." on_rolled = list("down" = "none") @@ -577,7 +577,7 @@ department tags on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/security/army - icon_state = "dept_army" + icon_state = "dept_marine" desc = "Insignia denoting assignment to the security department. These fit Army uniforms." on_rolled = list("down" = "none") @@ -596,7 +596,7 @@ department tags on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/medical/army - icon_state = "dept_army" + icon_state = "dept_marine" desc = "Insignia denoting assignment to the medical department. These fit Army uniforms." on_rolled = list("down" = "none") @@ -614,7 +614,7 @@ department tags on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/supply/army - icon_state = "dept_army" + icon_state = "dept_marine" desc = "Insignia denoting assignment to the supply department. These fit Army uniforms." on_rolled = list("down" = "none") @@ -632,7 +632,7 @@ department tags on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/service/army - icon_state = "dept_army" + icon_state = "dept_marine" desc = "Insignia denoting assignment to the service department. These fit Army uniforms." on_rolled = list("down" = "none") @@ -650,7 +650,7 @@ department tags on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none") /obj/item/clothing/accessory/solgov/department/exploration/army - icon_state = "dept_army" + icon_state = "dept_marine" desc = "Insignia denoting assignment to the exploration department. These fit Army uniforms." on_rolled = list("down" = "none") diff --git a/maps/torch/torch5_deck1.dmm b/maps/torch/torch5_deck1.dmm index 6d42d7b94e5e7..5b896dfedb83b 100644 --- a/maps/torch/torch5_deck1.dmm +++ b/maps/torch/torch5_deck1.dmm @@ -26558,15 +26558,16 @@ /turf/simulated/floor/reinforced, /area/rnd/misc_lab) "ryt" = ( +/obj/item/device/radio/intercom{ + pixel_y = 23 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/device/radio/intercom{ - pixel_y = 23 - }, +/obj/effect/floor_decal/industrial/hatch/red, /turf/simulated/floor/tiled/techfloor/grid, /area/command/armoury/tactical) "rzb" = ( @@ -58657,12 +58658,12 @@ ajJ aaa aaa acd -acd dVw dVw ryt svH svH +svH njm ksK nZZ @@ -58677,7 +58678,7 @@ aQq aQq eRU eRU -acd +eRU acd aaa aaa diff --git a/maps/torch/torch6_bridge.dmm b/maps/torch/torch6_bridge.dmm index af70b39849ae4..d852fd5563047 100644 --- a/maps/torch/torch6_bridge.dmm +++ b/maps/torch/torch6_bridge.dmm @@ -45394,7 +45394,6 @@ aa aa aa aa -aa ad ad ad @@ -45414,7 +45413,8 @@ ad ad ad ad -aa +ad +ad aa aa aa diff --git a/proxima/code/game/items/weapons/gun/projectiles/bosnia.dm b/proxima/code/game/items/weapons/gun/projectiles/bosnia.dm deleted file mode 100644 index c56bf0da180fc..0000000000000 --- a/proxima/code/game/items/weapons/gun/projectiles/bosnia.dm +++ /dev/null @@ -1,254 +0,0 @@ -/obj/item/gun/projectile/pistol/goodman - name = "military pistol" - desc = "The Hephaestus Industries P20 - a mass produced kinetic sidearm in widespread service with the SCGDF." - caliber = CALIBER_PISTOL - magazine_type = /obj/item/ammo_magazine/pistol - icon = 'proxima/icons/obj/guns/aurora_port/sol_pistol.dmi' - icon_state = "m8" - item_state = "m8" - item_icons = list( - slot_r_hand_str = 'proxima/icons/mob/onmob/righthand.dmi', - slot_l_hand_str = 'proxima/icons/mob/onmob/lefthand.dmi', - ) - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) - fire_delay = 7 - -/obj/item/gun/projectile/pistol/goodman/on_update_icon() - ..() - icon_state = (ammo_magazine)? "m8" : "m8-e" - -/obj/item/gun/projectile/pistol/magnum_pistol/sol - name = "magnum pistol" - desc = "The Herne-tek, just a cqc handgun that uses high-caliber ammo." - icon = 'proxima/icons/obj/guns/aurora_port/adhomian_heavy_pistol.dmi' - icon_state = "adhomian_heavy_pistol" - item_state = "adhomian_heavy_pistol" - item_icons = list( - slot_r_hand_str = 'proxima/icons/mob/onmob/righthand.dmi', - slot_l_hand_str = 'proxima/icons/mob/onmob/lefthand.dmi', - ) - force = 10 - caliber = CALIBER_PISTOL_MAGNUM - fire_delay = 5 - magazine_type = /obj/item/ammo_magazine/magnum - accuracy = 2 - one_hand_penalty = 2 - bulk = 3 - -/obj/item/gun/projectile/pistol/magnum_pistol/sol/on_update_icon() - ..() - icon_state = (ammo_magazine)? "adhomian_heavy_pistol" : "adhomian_heavy_pistol-e" - -/obj/item/gun/projectile/revolver/auto - name = "auto revolver" - icon = 'proxima/icons/obj/guns/aurora_port/autorevolver.dmi' - icon_state = "autorevolver" - item_state = "autorevolver" - item_icons = list( - slot_r_hand_str = 'proxima/icons/mob/onmob/righthand.dmi', - slot_l_hand_str = 'proxima/icons/mob/onmob/lefthand.dmi', - ) - caliber = CALIBER_PISTOL - ammo_type = /obj/item/ammo_casing/pistol - desc = "The Lumoco Arms' Solid is a rugged revolver for people who don't keep their guns well-maintained." - accuracy = 1 - bulk = 0 - fire_delay = 3 - has_safety = FALSE - -/obj/item/gun/projectile/automatic/bandit - name = "old submachine gun" - desc = "Old and rusty submachine gun, what is used by all sorts of bandits in SCG. Uses 6mmR rounds" - icon_state = "coltauto" - item_state = "coltauto" - icon = 'proxima/icons/obj/guns/aurora_port/coltauto.dmi' - item_icons = list( - slot_r_hand_str = 'proxima/icons/mob/onmob/righthand.dmi', - slot_l_hand_str = 'proxima/icons/mob/onmob/lefthand.dmi', - ) - - caliber = CALIBER_PISTOL_FLECHETTE - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3) - slot_flags = SLOT_BELT - ammo_type = /obj/item/ammo_casing/flechette - load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/proto_smg - screen_shake = 0.5 //SMG - - firemodes = list( - list(mode_name = "semiauto", mode_desc = "Fire as fast as you can pull the trigger", burst=1, fire_delay=0, move_delay=null), - list(mode_name="2-round bursts", mode_desc = "Short, controlled bursts", burst=2, fire_delay=null, move_delay=2, one_hand_penalty=2), - list(mode_name="3-round bursts", mode_desc = "Short, controlled bursts", burst=3, fire_delay=null, move_delay=4, one_hand_penalty=3) - ) - - bulk = GUN_BULK_RIFLE - 1 - w_class = ITEM_SIZE_NORMAL - one_hand_penalty = 2 - -/obj/item/gun/projectile/automatic/bandit/on_update_icon() - ..() - icon_state = (ammo_magazine)? "coltauto" : "coltauto-e" - -/obj/item/gun/projectile/sniper/semistrip/stealth - name = "stealth sniper rifle" - desc = "it's special design weapon that was designed for stealth assassination." - icon = 'proxima/icons/obj/guns/aurora_port/heavysniper.dmi' - icon_state = "heavysniper" - item_state = "heavysniper" - item_icons = list( - slot_r_hand_str = 'proxima/icons/mob/onmob/righthand.dmi', - slot_l_hand_str = 'proxima/icons/mob/onmob/lefthand.dmi', - slot_back_str = 'proxima/icons/mob/onmob/items/back-guns.dmi' - ) - w_class = ITEM_SIZE_LARGE - force = 10 - origin_tech = list(TECH_COMBAT = 2) - slot_flags = SLOT_BACK - caliber = CALIBER_PISTOL_ANTIQUE - ammo_type = /obj/item/ammo_casing/pistol/throwback - load_method = SINGLE_CASING - max_shells = 10 - accuracy = 3 - scope_zoom = 5 - scoped_accuracy = -2 - wielded_item_state = "heavysniper-wielded" - - -/obj/item/gun/projectile/pistol/police - name = "military police pistol" - desc = "The Hephaestus Industries P20 - a mass produced kinetic sidearm in widespread service with the SCGDF." - caliber = CALIBER_PISTOL - magazine_type = /obj/item/ammo_magazine/pistol - icon = 'proxima/icons/obj/guns/guns_onyx.dmi' - icon_state = "VP78" - item_state = "gun" - item_icons = list( - slot_r_hand_str = 'proxima/icons/mob/onmob/items/guns_r_default.dmi', - slot_l_hand_str = 'proxima/icons/mob/onmob/items/guns_l_default.dmi', - ) - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) - fire_delay = 4 - -/obj/item/gun/projectile/pistol/police/on_update_icon() - ..() - icon_state = (ammo_magazine)? "VP78" : "VP78-e" - -/obj/item/gun/projectile/pistol/police/wood - name = "military police pistol" - desc = "The Hephaestus Industries P20 - a mass produced kinetic sidearm in widespread service with the SCGDF." - caliber = CALIBER_PISTOL - magazine_type = /obj/item/ammo_magazine/pistol - icon = 'proxima/icons/obj/guns/guns_onyx.dmi' - icon_state = "VP78wood" - item_state = "gun" - fire_delay = 4 - -/obj/item/gun/projectile/pistol/police/on_update_icon() - ..() - icon_state = (ammo_magazine)? "VP78wood" : "VP78wood-e" - -/obj/item/gun/projectile/pistol/police/tactical - name = "military police pistol" - desc = "The Hephaestus Industries P20 - a mass produced kinetic sidearm in widespread service with the SCGDF." - caliber = CALIBER_PISTOL - magazine_type = /obj/item/ammo_magazine/pistol - icon = 'proxima/icons/obj/guns/guns_onyx.dmi' - icon_state = "VP78tactic" - item_state = "gun" - fire_delay = 4 - -/obj/item/gun/projectile/pistol/police/on_update_icon() - ..() - icon_state = (ammo_magazine)? "VP78tactic" : "VP78tactic-e" - -/obj/item/gun/projectile/automatic/selfdef - name = "self-defence machine pistol" - desc = "This is a submachine gun for self-defense that is loaded with a small magazine from a conventional pistol" - icon_state = "mpistolen" - item_state = "webley" - icon = 'proxima/icons/obj/guns/aurora_port/coltauto.dmi' - item_icons = list( - slot_r_hand_str = 'proxima/icons/mob/onmob/items/guns_r_default.dmi', - slot_l_hand_str = 'proxima/icons/mob/onmob/items/guns_l_default.dmi', - ) - - caliber = CALIBER_PISTOL - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3) - slot_flags = SLOT_BELT - load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/pistol - screen_shake = 0.5 //SMG - - firemodes = list( - list(mode_name = "semiauto", mode_desc = "Fire as fast as you can pull the trigger", burst=1, fire_delay=0, move_delay=null), - list(mode_name="2-round bursts", mode_desc = "Short, controlled bursts", burst=2, fire_delay=null, move_delay=2, one_hand_penalty=2), - list(mode_name="3-round bursts", mode_desc = "Short, controlled bursts", burst=3, fire_delay=null, move_delay=4, one_hand_penalty=3) - ) - - bulk = GUN_BULK_RIFLE - 1 - w_class = ITEM_SIZE_NORMAL - one_hand_penalty = 2 - -/obj/item/gun/projectile/automatic/bandit/on_update_icon() - ..() - icon_state = (ammo_magazine)? "mpistolen" : "mpistolen-empty" - - -/obj/item/gun/projectile/automatic/carabine_tactical - name = "Special forces carabine" - desc = "SC-42 carabine - These are weapons specially designed to resolve conflicts on the streets without attracting unnecessary attention. By integrating a silencer, it is mainly used by the military police of the SCG." - icon = 'proxima/icons/obj/guns/carabine.dmi' - icon_state = "arg75" - item_state = "arifle" - wielded_item_state = "arifle-wielded" - item_icons = list( - slot_r_hand_str = 'proxima/icons/mob/onmob/items/guns_r_default.dmi', - slot_l_hand_str = 'proxima/icons/mob/onmob/items/guns_l_default.dmi', - ) - fire_delay = 4 - caliber = CALIBER_CARABINE - ammo_type = /obj/item/ammo_casing/rifle/carabine - magazine_type = /obj/item/ammo_magazine/carabine_rifle - load_method = MAGAZINE - allowed_magazines = /obj/item/ammo_magazine/carabine_rifle - silenced = TRUE - multi_aim = 1 - can_special_reload = TRUE - firemodes = list( - list(mode_name = "semiauto", mode_desc = "Fire as fast as you can pull the trigger", burst=1, fire_delay=0, move_delay=null), - list(mode_name="2-round bursts", mode_desc = "Short, controlled bursts", burst=2, fire_delay=null, move_delay=2, one_hand_penalty=2), - list(mode_name="3-round bursts", mode_desc = "Short, controlled bursts", burst=3, fire_delay=null, move_delay=4, one_hand_penalty=3) - ) - -/obj/item/gun/projectile/automatic/carabine_tactical/on_update_icon() - ..() - icon_state = "arg75" - if(ammo_magazine) - overlays += image(icon, "arg75_mag") - - -/obj/item/ammo_magazine/carabine_rifle - name = "carabine rifle magazine" - icon = 'proxima/icons/obj/ammo.dmi' - icon_state = "carabine" - origin_tech = list(TECH_COMBAT = 2) - mag_type = MAGAZINE - caliber = CALIBER_CARABINE - matter = list(MATERIAL_STEEL = 1400) - ammo_type = /obj/item/ammo_casing/rifle/carabine - max_ammo = 20 - multiple_sprites = 1 - -/obj/item/ammo_casing/rifle/carabine - desc = "A spec.ops carabine casing." - caliber = CALIBER_CARABINE - projectile_type = /obj/item/projectile/bullet/rifle/carabine - icon_state = "rifle_mil" - spent_icon = "rifle_mil-spent" - -/obj/item/projectile/bullet/rifle/carabine - fire_sound = 'sound/weapons/gunshot/gunshot3.ogg' - damage = 35 - armor_penetration = 30 - penetration_modifier = 1 - penetrating = 0 //INF, WAS 1 diff --git a/proxima/code/modules/clothing/pouch/pouch.dm b/proxima/code/modules/clothing/pouch/pouch.dm index 583fdbc4d4687..9c6da183665e6 100644 --- a/proxima/code/modules/clothing/pouch/pouch.dm +++ b/proxima/code/modules/clothing/pouch/pouch.dm @@ -1,7 +1,7 @@ /obj/item/storage/pouch name = "pouch" desc = "Can hold various things." - icon = 'proxima/icons/obj/clothing/icon.dmi' + icon = 'proxima/icons/obj/pouch.dmi' icon_state = "pouch" item_state = "pouch" cant_hold = list(/obj/item/storage/pouch) //Pouches in pouches was a misstake @@ -236,7 +236,7 @@ ..() overlays.Cut() if(contents.len) - overlays += (image('proxima/icons/obj/clothing/icon.dmi', "flare_[contents.len]")) + overlays += (image('proxima/icons/obj/pouch.dmi', "flare_[contents.len]")) /obj/item/storage/pouch/pistol_holster @@ -269,7 +269,7 @@ ..() overlays.Cut() if(contents.len) - overlays += (image('proxima/icons/obj/clothing/icon.dmi', "pistol_layer")) + overlays += (image('proxima/icons/obj/pouch.dmi', "pistol_layer")) /obj/item/storage/pouch/pistol_holster/cowboy name = "belt holster" @@ -286,7 +286,7 @@ ..() overlays.Cut() if(contents.len) - overlays += (image('proxima/icons/obj/clothing/icon.dmi', "gun_[contents.len]")) + overlays += (image('proxima/icons/obj/pouch.dmi', "gun_[contents.len]")) /obj/item/storage/pouch/kniferig name = "throwing knife rig" @@ -302,7 +302,7 @@ ..() overlays.Cut() if(contents.len) - overlays += (image('proxima/icons/obj/clothing/icon.dmi', "knife_[contents.len]")) + overlays += (image('proxima/icons/obj/pouch.dmi', "knife_[contents.len]")) /obj/item/storage/pouch/baton_holster @@ -336,4 +336,4 @@ ..() overlays.Cut() if(contents.len) - overlays += (image('proxima/icons/obj/clothing/icon.dmi', "baton_layer")) + overlays += (image('proxima/icons/obj/pouch.dmi', "baton_layer")) diff --git a/proxima/icons/obj/cart.dmi b/proxima/icons/obj/cart.dmi deleted file mode 100644 index 6b7b80483e988..0000000000000 Binary files a/proxima/icons/obj/cart.dmi and /dev/null differ diff --git a/proxima/icons/obj/clothing/icon.dmi b/proxima/icons/obj/clothing/icon.dmi deleted file mode 100644 index 80a3a17ed2254..0000000000000 Binary files a/proxima/icons/obj/clothing/icon.dmi and /dev/null differ diff --git a/proxima/icons/obj/clothing/icon_acs.dmi b/proxima/icons/obj/clothing/icon_acs.dmi deleted file mode 100644 index e87044e133416..0000000000000 Binary files a/proxima/icons/obj/clothing/icon_acs.dmi and /dev/null differ diff --git a/proxima/icons/obj/clothing/not_used_acs.dmi b/proxima/icons/obj/clothing/not_used_acs.dmi new file mode 100644 index 0000000000000..405ebc0ad7b9b Binary files /dev/null and b/proxima/icons/obj/clothing/not_used_acs.dmi differ diff --git a/proxima/icons/obj/clothing/not_used_suit.dmi b/proxima/icons/obj/clothing/not_used_suit.dmi index 904a28d2b6c71..c85cfba3c55c7 100644 Binary files a/proxima/icons/obj/clothing/not_used_suit.dmi and b/proxima/icons/obj/clothing/not_used_suit.dmi differ diff --git a/proxima/icons/obj/clothing/obj_accessories.dmi b/proxima/icons/obj/clothing/obj_accessories.dmi index 98a8932bf67b3..e2fb32b7ba8e5 100644 Binary files a/proxima/icons/obj/clothing/obj_accessories.dmi and b/proxima/icons/obj/clothing/obj_accessories.dmi differ diff --git a/proxima/icons/obj/clothing/obj_suit.dmi b/proxima/icons/obj/clothing/obj_suit.dmi index 43abb222eb1ed..882371858dbc0 100644 Binary files a/proxima/icons/obj/clothing/obj_suit.dmi and b/proxima/icons/obj/clothing/obj_suit.dmi differ diff --git a/proxima/icons/obj/clothing/pouch.dmi b/proxima/icons/obj/clothing/pouch.dmi new file mode 100644 index 0000000000000..21ed81113ce32 Binary files /dev/null and b/proxima/icons/obj/clothing/pouch.dmi differ diff --git a/proxima/icons/obj/guns/carabine.dmi b/proxima/icons/obj/guns/carabine.dmi deleted file mode 100644 index 6f760cffe925b..0000000000000 Binary files a/proxima/icons/obj/guns/carabine.dmi and /dev/null differ diff --git a/proxima/icons/obj/guns/guns.dmi b/proxima/icons/obj/guns/guns.dmi index 94b0a00542cb9..4eb836950be94 100644 Binary files a/proxima/icons/obj/guns/guns.dmi and b/proxima/icons/obj/guns/guns.dmi differ diff --git a/proxima/icons/obj/pouch.dmi b/proxima/icons/obj/pouch.dmi new file mode 100644 index 0000000000000..21ed81113ce32 Binary files /dev/null and b/proxima/icons/obj/pouch.dmi differ diff --git a/proxima/icons/obj/storage.dmi b/proxima/icons/obj/storage.dmi index 7a4164c3bbf22..e315c057453ac 100644 Binary files a/proxima/icons/obj/storage.dmi and b/proxima/icons/obj/storage.dmi differ