diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index 17e03bf088f..51457f5c2a0 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -50272,7 +50272,6 @@ pixel_x = -4; pixel_y = 10 }, -/obj/item/storage/medkit/tactical/blueshield, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/blueshield) "jGa" = ( @@ -126743,7 +126742,6 @@ /obj/item/storage/backpack/blueshield, /obj/item/storage/backpack/duffelbag/blueshield, /obj/item/storage/backpack/satchel/blueshield, -/obj/item/clothing/gloves/tackler/combat/insulated/blueshield, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 7c2571b24f6..4df7be29bc7 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -31453,7 +31453,6 @@ pixel_x = -4; pixel_y = 10 }, -/obj/item/storage/medkit/tactical/blueshield, /obj/effect/turf_decal/stripes/line{ dir = 10 }, diff --git a/modular_nova/modules/blueshield/code/blueshield.dm b/modular_nova/modules/blueshield/code/blueshield.dm index 5bc360f18be..152194778b9 100644 --- a/modular_nova/modules/blueshield/code/blueshield.dm +++ b/modular_nova/modules/blueshield/code/blueshield.dm @@ -48,7 +48,7 @@ jobtype = /datum/job/blueshield uniform = /obj/item/clothing/under/rank/blueshield suit = /obj/item/clothing/suit/armor/vest/blueshield/jacket - gloves = /obj/item/clothing/gloves/tackler/combat/insulated + gloves = /obj/item/clothing/gloves/tackler/security id = /obj/item/card/id/advanced/centcom shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/headset_bs/alt @@ -61,6 +61,7 @@ head = /obj/item/clothing/head/beret/blueshield box = /obj/item/storage/box/survival/security belt = /obj/item/modular_computer/pda/security + l_pocket = /obj/item/sensor_device/blueshield id_trim = /datum/id_trim/job/blueshield diff --git a/modular_nova/modules/blueshield/code/closet.dm b/modular_nova/modules/blueshield/code/closet.dm index 773155a1e30..f7d52beacd7 100644 --- a/modular_nova/modules/blueshield/code/closet.dm +++ b/modular_nova/modules/blueshield/code/closet.dm @@ -33,7 +33,13 @@ new /obj/item/assembly/flash/handheld(src) new /obj/item/restraints/handcuffs(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) +<<<<<<< HEAD new /obj/item/storage/medkit/tactical/blueshield(src) // new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) FF EDIT: DELETION - BLUESHIELD-REARM +======= + new /obj/item/storage/medkit/frontier/stocked(src) + new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) +>>>>>>> b8061af7e (And look, the red just washes right out! | Changes a lot of blueshield equipment stuff and resprites their crew monitor (#372)) new /obj/item/storage/bag/garment/blueshield(src) new /obj/item/mod/control/pre_equipped/blueshield(src) + new /obj/item/sensor_device/blueshield(src) diff --git a/modular_nova/modules/blueshield/code/clothing.dm b/modular_nova/modules/blueshield/code/clothing.dm index 27c7edb7ad9..cd6fdfbc50f 100644 --- a/modular_nova/modules/blueshield/code/clothing.dm +++ b/modular_nova/modules/blueshield/code/clothing.dm @@ -2,19 +2,6 @@ //Uniform items are in command.dm -/obj/item/clothing/gloves/tackler/combat/insulated/blueshield - name = "combat gloves" - desc = "These tactical gloves appear to be unique, made out of double woven durathread fibers which make it fireproof as well as acid resistant" - icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi' - icon_state = "combat" - worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi' - resistance_flags = FIRE_PROOF | ACID_PROOF - armor_type = /datum/armor/insulated_blueshield - -/datum/armor/insulated_blueshield - fire = 100 - acid = 100 - /obj/item/radio/headset/headset_bs name = "\proper the blueshield's headset" icon = 'modular_nova/modules/blueshield/icons/radio.dmi' @@ -32,17 +19,12 @@ . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) - /obj/item/clothing/head/helmet/space/plasmaman/blueshield name = "blueshield envirosuit helmet" desc = "A plasmaman containment helmet designed for certified blueshields, who's job guarding heads should not include self-combustion... most of the time." icon = 'modular_nova/master_files/icons/obj/clothing/head/plasmaman_hats.dmi' worn_icon = 'modular_nova/master_files/icons/mob/clothing/head/plasmaman_head.dmi' icon_state = "bs_envirohelm" - armor_type = /datum/armor/head_helmet/plasmaman/blueshield - -/datum/armor/head_helmet/plasmaman/blueshield - acid = 90 /obj/item/clothing/under/plasmaman/blueshield name = "blueshield envirosuit" @@ -56,8 +38,6 @@ /datum/armor/clothing_under/under_plasmaman_blueshield melee = 10 - laser = 10 - bomb = 5 bio = 100 fire = 95 acid = 95 @@ -68,15 +48,9 @@ greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#3A4E7D#DEB63D" - //alternate_worn_icon_digi = 'modular_nova/icons/mob/head_muzzled.dmi' icon_state = "beret_badge_police" - armor_type = /datum/armor/head_helmet/blueshield supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -/datum/armor/head_helmet/blueshield - fire = 75 - acid = 75 - /obj/item/clothing/head/beret/blueshield/navy name = "navy blueshield's beret" desc = "A navy-blue beret made of durathread with a silver badge, denoting its owner as a Blueshield Lieuteneant. It seems to be padded with nano-kevlar, making it tougher than standard reinforced berets." @@ -120,7 +94,6 @@ desc = "A tight-fitting kevlar-lined vest with a blue badge on the chest of it." icon_state = "blueshieldarmor" body_parts_covered = CHEST - armor_type = /datum/armor/suit_armor/blueshield uses_advanced_reskins = TRUE unique_reskin = list( "Slim" = list( @@ -143,11 +116,6 @@ ), ) -/datum/armor/suit_armor/blueshield - bomb = 30 - fire = 75 - acid = 75 - /obj/item/clothing/suit/armor/vest/blueshield/jacket name = "blueshield's jacket" desc = "An expensive kevlar-lined jacket with a golden badge on the chest and \"NT\" emblazoned on the back. It weighs surprisingly little, despite how heavy it looks." @@ -165,7 +133,7 @@ desc = "A comfy kevlar-lined coat with blue highlights, fit to keep the blueshield armored and warm." hoodtype = /obj/item/clothing/head/hooded/winterhood/nova/blueshield allowed = list(/obj/item/melee/baton/security/loaded) - armor_type = /datum/armor/suit_armor/blueshield + armor_type = /datum/armor/suit_armor /obj/item/clothing/suit/hooded/wintercoat/nova/blueshield/Initialize(mapload) . = ..() @@ -174,4 +142,4 @@ /obj/item/clothing/head/hooded/winterhood/nova/blueshield icon_state = "hood_blueshield" desc = "A comfy kevlar-lined hood to go with the comfy kevlar-lined coat." - armor_type = /datum/armor/suit_armor/blueshield + armor_type = /datum/armor/suit_armor diff --git a/modular_nova/modules/blueshield/code/medkit.dm b/modular_nova/modules/blueshield/code/medkit.dm deleted file mode 100644 index 3939188f699..00000000000 --- a/modular_nova/modules/blueshield/code/medkit.dm +++ /dev/null @@ -1,13 +0,0 @@ -/obj/item/storage/medkit/tactical/blueshield - name = "blueshield combat medical kit" - desc = "Blue boy to the rescue!" - color = "#AAAAFF" - -/obj/item/storage/medkit/tactical/blueshield/PopulateContents() - if(empty) - return - new /obj/item/stack/medical/gauze(src) - new /obj/item/stack/medical/bruise_pack(src) - new /obj/item/stack/medical/ointment(src) - new /obj/item/healthanalyzer(src) - new /obj/item/sensor_device/blueshield(src) diff --git a/modular_nova/modules/blueshield/code/modsuit/mod_theme.dm b/modular_nova/modules/blueshield/code/modsuit/mod_theme.dm index f7155396c92..2a3ad3d195a 100644 --- a/modular_nova/modules/blueshield/code/modsuit/mod_theme.dm +++ b/modular_nova/modules/blueshield/code/modsuit/mod_theme.dm @@ -10,17 +10,12 @@ fires, electrical shocks, and contempt from the rest of the crew." default_skin = "praetorian" - armor_type = /datum/armor/mod_theme_blueshield - resistance_flags = FIRE_PROOF|ACID_PROOF + armor_type = /datum/armor/mod_theme_security atom_flags = PREVENT_CONTENTS_EXPLOSION_1 - max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - siemens_coefficient = 0 - complexity_max = DEFAULT_MAX_COMPLEXITY + 3 - slowdown_inactive = 0.75 - slowdown_active = 0.25 + slowdown_inactive = 1 + slowdown_active = 0.5 allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, + /obj/item/reagent_containers/spray/pepper, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton, @@ -54,14 +49,3 @@ ), ), ) - -/datum/armor/mod_theme_blueshield - melee = 40 - bullet = 30 - laser = 30 - energy = 40 - bomb = 50 - bio = 100 - fire = 100 - acid = 100 - wound = 20 diff --git a/modular_nova/modules/blueshield/code/modsuit/mod_type.dm b/modular_nova/modules/blueshield/code/modsuit/mod_type.dm index 2620cbcea70..d62237d2f4d 100644 --- a/modular_nova/modules/blueshield/code/modsuit/mod_type.dm +++ b/modular_nova/modules/blueshield/code/modsuit/mod_type.dm @@ -3,15 +3,12 @@ icon = 'modular_nova/modules/blueshield/icons/praetorian.dmi' icon_state = "praetorian-control" theme = /datum/mod_theme/blueshield - applied_cell = /obj/item/stock_parts/cell/super + applied_cell = /obj/item/stock_parts/cell/high applied_modules = list( - /obj/item/mod/module/storage/large_capacity, + /obj/item/mod/module/storage, /obj/item/mod/module/magnetic_harness, /obj/item/mod/module/flashlight, - /obj/item/mod/module/jetpack, /obj/item/mod/module/projectile_dampener, /obj/item/mod/module/quick_carry, - ) - default_pins = list( - /obj/item/mod/module/jetpack, + /obj/item/mod/module/holster, ) diff --git a/modular_nova/modules/blueshield/icons/M45A5.dmi b/modular_nova/modules/blueshield/icons/M45A5.dmi deleted file mode 100644 index 0334a6cdc78..00000000000 Binary files a/modular_nova/modules/blueshield/icons/M45A5.dmi and /dev/null differ diff --git a/modular_nova/modules/blueshield/icons/device.dmi b/modular_nova/modules/blueshield/icons/device.dmi index e079de6c160..449e4305274 100644 Binary files a/modular_nova/modules/blueshield/icons/device.dmi and b/modular_nova/modules/blueshield/icons/device.dmi differ diff --git a/modular_nova/modules/blueshield/icons/energy.dmi b/modular_nova/modules/blueshield/icons/energy.dmi deleted file mode 100644 index 85194b40854..00000000000 Binary files a/modular_nova/modules/blueshield/icons/energy.dmi and /dev/null differ diff --git a/modular_nova/modules/blueshield/icons/guns_lefthand.dmi b/modular_nova/modules/blueshield/icons/guns_lefthand.dmi deleted file mode 100644 index 73dc7d7dd3f..00000000000 Binary files a/modular_nova/modules/blueshield/icons/guns_lefthand.dmi and /dev/null differ diff --git a/modular_nova/modules/blueshield/icons/guns_righthand.dmi b/modular_nova/modules/blueshield/icons/guns_righthand.dmi deleted file mode 100644 index f3e932f2186..00000000000 Binary files a/modular_nova/modules/blueshield/icons/guns_righthand.dmi and /dev/null differ diff --git a/modular_nova/modules/blueshield/icons/melee_lefthand.dmi b/modular_nova/modules/blueshield/icons/melee_lefthand.dmi deleted file mode 100644 index 8e76fa56cec..00000000000 Binary files a/modular_nova/modules/blueshield/icons/melee_lefthand.dmi and /dev/null differ diff --git a/modular_nova/modules/blueshield/icons/melee_righthand.dmi b/modular_nova/modules/blueshield/icons/melee_righthand.dmi deleted file mode 100644 index ae39c2bd251..00000000000 Binary files a/modular_nova/modules/blueshield/icons/melee_righthand.dmi and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index 66539905a9a..9c566af049d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6707,7 +6707,6 @@ #include "modular_nova\modules\blueshield\code\clothing.dm" #include "modular_nova\modules\blueshield\code\encryptionkey.dm" #include "modular_nova\modules\blueshield\code\landmarks.dm" -#include "modular_nova\modules\blueshield\code\medkit.dm" #include "modular_nova\modules\blueshield\code\devices\crew.dm" #include "modular_nova\modules\blueshield\code\devices\sensor_device.dm" #include "modular_nova\modules\blueshield\code\modsuit\mod_theme.dm"