diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index 72da2a089b..3099d8d955 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -147,8 +147,8 @@ contains = list( /obj/item/clothing/accessory/holster, /obj/item/clothing/accessory/holster/armpit, - /obj/item/clothing/accessory/holster/visible/waist, - /obj/item/clothing/accessory/holster/visible/hip + /obj/item/clothing/accessory/holster/waist, + /obj/item/clothing/accessory/holster/hip ) cost = 15 containertype = "/obj/structure/closet/crate/secure" @@ -288,7 +288,7 @@ /obj/item/device/flash, /obj/item/device/hailer, /obj/item/clothing/accessory/badge/holo/hos, - /obj/item/clothing/accessory/holster/visible/waist, + /obj/item/clothing/accessory/holster/waist, /obj/item/weapon/melee/telebaton, /obj/item/weapon/shield/riot/tele, /obj/item/clothing/head/beret/sec/corporate/hos, diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index b66017345d..7bfa22ad43 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -100,8 +100,8 @@ var/datum/antagonist/raider/raiders var/list/raider_holster = list( /obj/item/clothing/accessory/holster/armpit, - /obj/item/clothing/accessory/holster/visible/waist, - /obj/item/clothing/accessory/holster/visible/hip + /obj/item/clothing/accessory/holster/waist, + /obj/item/clothing/accessory/holster/hip ) /datum/antagonist/raider/New() diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index ff8dc9f3be..ceb5570ff2 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -410,6 +410,13 @@ preserve = 1 break + if(istype(W,/obj/item/weapon/implant/health)) + for(var/obj/machinery/computer/cloning/com in world) + for(var/datum/dna2/record/R in com.records) + if(R.implant == W) + qdel(R) + qdel(W) + if(!preserve) qdel(W) else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 501bae5ffa..064f58f83e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -122,7 +122,7 @@ new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/cell/device/weapon(src) - new /obj/item/clothing/accessory/holster/visible/waist(src) + new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/weapon/melee/telebaton(src) new /obj/item/clothing/head/beret/sec/corporate/hos(src) new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 73d3c29bdf..fd4e600515 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -50,9 +50,9 @@ new /obj/item/clothing/accessory/armband(src) new /obj/item/clothing/accessory/armband(src) new /obj/item/clothing/accessory/armband(src) - new /obj/item/clothing/accessory/holster/visible/waist(src) - new /obj/item/clothing/accessory/holster/visible/waist(src) - new /obj/item/clothing/accessory/holster/visible/waist(src) + new /obj/item/clothing/accessory/holster/waist(src) + new /obj/item/clothing/accessory/holster/waist(src) + new /obj/item/clothing/accessory/holster/waist(src) return diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index ab1441940e..3441962ef0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -112,15 +112,15 @@ /datum/gear/accessory/holster/hip display_name = "holster, hip" - path = /obj/item/clothing/accessory/holster/visible/hip + path = /obj/item/clothing/accessory/holster/hip /datum/gear/accessory/holster/leg display_name = "holster, leg" - path = /obj/item/clothing/accessory/holster/visible/leg + path = /obj/item/clothing/accessory/holster/leg /datum/gear/accessory/holster/waist display_name = "holster, waist" - path = /obj/item/clothing/accessory/holster/visible/waist + path = /obj/item/clothing/accessory/holster/waist /datum/gear/accessory/tie display_name = "tie, black" diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index 95dcd6f7a1..d9dc2f2e54 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -116,22 +116,22 @@ desc = "A worn-out handgun holster. Perfect for concealed carry" icon_state = "holster" -/obj/item/clothing/accessory/holster/visible - concealed_holster = 0 - -/obj/item/clothing/accessory/holster/visible/waist +/obj/item/clothing/accessory/holster/waist name = "waist holster" desc = "A handgun holster. Made of expensive leather." icon_state = "holster" overlay_state = "holster_low" + concealed_holster = 0 -/obj/item/clothing/accessory/holster/visible/hip +/obj/item/clothing/accessory/holster/hip name = "hip holster" desc = "A handgun holster slung low on the hip, draw pardner!" icon_state = "holster_hip" + concealed_holster = 0 -/obj/item/clothing/accessory/holster/visible/leg +/obj/item/clothing/accessory/holster/leg name = "leg holster" desc = "A tacticool handgun holster. Worn on the upper leg." icon_state = "holster_hip" - overlay_state = "holster_leg" \ No newline at end of file + overlay_state = "holster_leg" + concealed_holster = 0 \ No newline at end of file diff --git a/maps/polaris-2.dmm b/maps/polaris-2.dmm index 65322e3209..c740abc329 100644 --- a/maps/polaris-2.dmm +++ b/maps/polaris-2.dmm @@ -701,7 +701,7 @@ "any" = (/obj/machinery/photocopier,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) "anz" = (/obj/structure/table/steel_reinforced,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/shuttle/trade/centcom) "anA" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/lipstick/black,/obj/item/weapon/lipstick/jade,/obj/item/weapon/lipstick/purple,/obj/item/weapon/lipstick,/obj/item/weapon/lipstick/random,/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/shuttle/trade/centcom) -"anB" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/accessory/holster/visible/hip,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/visible/hip,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/scarf/white,/obj/item/clothing/accessory/scarf/lightblue,/obj/item/clothing/accessory/scarf/red,/obj/item/clothing/accessory/scarf/purple,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/accessory/armband/med,/obj/item/clothing/accessory/armband/engine,/obj/item/clothing/accessory/armband/cargo,/obj/item/clothing/accessory/armband,/obj/item/clothing/accessory/medal/nobel_science,/obj/item/clothing/accessory/medal/silver,/obj/item/clothing/accessory/medal/gold,/obj/item/clothing/accessory/medal/bronze_heart,/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/shuttle/trade/centcom) +"anB" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/scarf/white,/obj/item/clothing/accessory/scarf/lightblue,/obj/item/clothing/accessory/scarf/red,/obj/item/clothing/accessory/scarf/purple,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/accessory/armband/med,/obj/item/clothing/accessory/armband/engine,/obj/item/clothing/accessory/armband/cargo,/obj/item/clothing/accessory/armband,/obj/item/clothing/accessory/medal/nobel_science,/obj/item/clothing/accessory/medal/silver,/obj/item/clothing/accessory/medal/gold,/obj/item/clothing/accessory/medal/bronze_heart,/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/shuttle/trade/centcom) "anC" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/schoolgirl,/obj/item/clothing/under/redcoat,/obj/item/clothing/under/sexymime,/obj/item/clothing/under/sexyclown,/obj/item/clothing/under/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/janimaid,/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/shuttle/trade/centcom) "anD" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/suit/hgpirate,/obj/item/clothing/suit/imperium_monk,/obj/item/clothing/suit/leathercoat,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/pirate,/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/shuttle/trade/centcom) "anE" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/structure/closet/crate/solar,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/shuttle/trade/centcom) @@ -952,8 +952,8 @@ "asp" = (/obj/structure/lattice,/obj/structure/grille/broken,/turf/space,/area/space) "asq" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT"; name = "Assault Armor Storage"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "asr" = (/obj/structure/table/rack,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ass" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/visible/waist,/obj/item/clothing/accessory/holster/visible/waist,/obj/item/clothing/accessory/holster/visible/waist,/obj/item/clothing/accessory/holster/visible/waist,/obj/item/clothing/accessory/holster/visible/waist,/obj/item/clothing/accessory/holster/visible/waist,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ast" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/visible/hip,/obj/item/clothing/accessory/holster/visible/hip,/obj/item/clothing/accessory/holster/visible/hip,/obj/item/clothing/accessory/holster/visible/hip,/obj/item/clothing/accessory/holster/visible/hip,/obj/item/clothing/accessory/holster/visible/hip,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ass" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ast" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "asu" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "asv" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 32},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "asw" = (/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/weapon/screwdriver,/obj/item/weapon/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)