diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 077547f7d93..06b7c053538 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -31013,10 +31013,6 @@ pixel_x = -4; pixel_y = 10 }, -/obj/item/storage/box/gunset, -/obj/item/storage/medkit/tactical/blueshield{ - color = "#AAAAFF" - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm index 6b171185972..3d900140f14 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield.dm @@ -55,7 +55,7 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses backpack_contents = list( /obj/item/storage/box/gunset/blueshield = 1, - /obj/item/melee/baton/security/loaded = 1,) + ) implants = list(/obj/item/implant/mindshield) backpack = /obj/item/storage/backpack/blueshield satchel = /obj/item/storage/backpack/satchel/blueshield @@ -71,41 +71,3 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/blueshield uniform = /obj/item/clothing/under/plasmaman/blueshield - -/obj/item/storage/box/gunset/blueshield - name = "Blueshield's CMG-1 gunset" - w_class = WEIGHT_CLASS_NORMAL - -/obj/item/storage/box/gunset/blueshield/PopulateContents() - . = ..() - new /obj/item/gun/ballistic/automatic/cmg/nomag(src) - new /obj/item/ammo_box/magazine/multi_sprite/cmg(src) - new /obj/item/ammo_box/magazine/multi_sprite/cmg(src) - new /obj/item/ammo_box/magazine/multi_sprite/cmg/lethal(src) - new /obj/item/ammo_box/magazine/multi_sprite/cmg/lethal(src) - new /obj/item/suppressor/nanotrasen(src) - -/obj/item/suppressor/nanotrasen - name = "NT-S suppressor" - desc = "A Nanotrasen brand small-arms suppressor, including a large NT logo stamped on the side." - -/obj/item/ammo_casing/energy/laser/hellfire/bs - projectile_type = /obj/projectile/beam/laser/hellfire - e_cost = 83 //Lets it squeeze out a few more shots - select_name = "maim" - -/obj/item/gun/energy/laser/hellgun/blueshield - name = "\improper Allstar SC-3 PDW 'Hellfire'" - desc = "A prototype energy carbine, despite NT's ban on hellfire weaponry due to negative press. \ - Allstar continued to work on it, compacting it into a small form-factor for personal defense. \ - As part of the Asset Retention Program created by Nanotrasen, Allstar's prototype began to be put into use." - icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' - worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi' - lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' - righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' - icon_state = "hellfirepdw" - worn_icon_state = "hellfirepdw" - ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire/bs) - -/obj/item/gun/energy/laser/hellgun/blueshield/give_manufacturer_examine() - AddComponent(/datum/component/manufacturer_examine, COMPANY_ALLSTAR) diff --git a/modular_skyrat/modules/blueshield/code/blueshield_closet.dm b/modular_skyrat/modules/blueshield/code/closet.dm similarity index 84% rename from modular_skyrat/modules/blueshield/code/blueshield_closet.dm rename to modular_skyrat/modules/blueshield/code/closet.dm index d518f1722e8..54e5665135e 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield_closet.dm +++ b/modular_skyrat/modules/blueshield/code/closet.dm @@ -6,11 +6,11 @@ /obj/structure/closet/secure_closet/blueshield/New() ..() - new /obj/item/storage/briefcase(src) - new /obj/item/pinpointer/crew(src) + new /obj/item/storage/secure/briefcase(src) new /obj/item/storage/belt/security/full(src) new /obj/item/grenade/flashbang(src) new /obj/item/assembly/flash/handheld(src) new /obj/item/restraints/handcuffs(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/clothing/suit/hooded/wintercoat/skyrat/blueshield(src) + new /obj/item/storage/medkit/tactical/blueshield(src) diff --git a/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm b/modular_skyrat/modules/blueshield/code/clothing.dm similarity index 96% rename from modular_skyrat/modules/blueshield/code/blueshield_clothing.dm rename to modular_skyrat/modules/blueshield/code/clothing.dm index 6b282f3ebeb..b6086509f56 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm +++ b/modular_skyrat/modules/blueshield/code/clothing.dm @@ -97,7 +97,7 @@ /obj/item/storage/backpack/blueshield name = "blueshield backpack" desc = "A robust backpack issued to Nanotrasen's finest." - icon = 'modular_skyrat/modules/blueshield/icons/blueshieldpacks.dmi' + icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' icon_state = "blueshieldpack" inhand_icon_state = "securitypack" @@ -105,7 +105,7 @@ /obj/item/storage/backpack/satchel/blueshield name = "blueshield satchel" desc = "A robust satchel issued to Nanotrasen's finest." - icon = 'modular_skyrat/modules/blueshield/icons/blueshieldpacks.dmi' + icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' icon_state = "satchel-blueshield" inhand_icon_state = "satchel-sec" @@ -113,7 +113,7 @@ /obj/item/storage/backpack/duffelbag/blueshield name = "blueshield duffelbag" desc = "A robust duffelbag issued to Nanotrasen's finest." - icon = 'modular_skyrat/modules/blueshield/icons/blueshieldpacks.dmi' + icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' icon_state = "duffel-blueshield" inhand_icon_state = "duffel-sec" diff --git a/modular_skyrat/modules/blueshield/code/medkit.dm b/modular_skyrat/modules/blueshield/code/medkit.dm index 8f71ce15d75..bf50bdbf8c4 100644 --- a/modular_skyrat/modules/blueshield/code/medkit.dm +++ b/modular_skyrat/modules/blueshield/code/medkit.dm @@ -1,7 +1,7 @@ /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 diff --git a/modular_skyrat/modules/blueshield/code/special.dm b/modular_skyrat/modules/blueshield/code/special.dm deleted file mode 100644 index 941f9aa7068..00000000000 --- a/modular_skyrat/modules/blueshield/code/special.dm +++ /dev/null @@ -1,44 +0,0 @@ -/obj/item/gun/energy/e_gun/revolver //The virgin gun. - name = "energy revolver" - desc = "An advanced energy revolver with the capacity to shoot both electrodes and lasers." - force = 7 - ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) - ammo_x_offset = 1 - charge_sections = 4 - fire_delay = 4 - icon = 'modular_skyrat/modules/blueshield/icons/energy.dmi' - icon_state = "bsgun" - inhand_icon_state = "minidisable" - lefthand_file = 'modular_skyrat/modules/blueshield/icons/guns_lefthand.dmi' - righthand_file = 'modular_skyrat/modules/blueshield/icons/guns_righthand.dmi' - obj_flags = UNIQUE_RENAME - cell_type = /obj/item/stock_parts/cell/blueshield - pin = /obj/item/firing_pin/implant/mindshield - selfcharge = TRUE - -/obj/item/stock_parts/cell/blueshield - name = "internal revolver power cell" - maxcharge = 1500 - chargerate = 300 - -/obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun. - name = "PDW-9 taser pistol" - desc = "A military grade energy sidearm, used by many militia forces throughout the local sector. It comes with an internally recharging battery which is slow to recharge." - ammo_x_offset = 2 - icon_state = "pdw9pistol" - inhand_icon_state = null - cell_type = /obj/item/stock_parts/cell/pdw9 - -/obj/item/stock_parts/cell/pdw9 - name = "internal pistol power cell" - maxcharge = 1000 - chargerate = 300 - var/obj/item/gun/energy/e_gun/revolver/pdw9/parent - -/obj/item/stock_parts/cell/pdw9/Initialize(mapload) - . = ..() - parent = loc - -/obj/item/stock_parts/cell/pdw9/process() - . = ..() - parent.update_icon() diff --git a/modular_skyrat/modules/blueshield/code/weapons.dm b/modular_skyrat/modules/blueshield/code/weapons.dm new file mode 100644 index 00000000000..efcfb7a1b54 --- /dev/null +++ b/modular_skyrat/modules/blueshield/code/weapons.dm @@ -0,0 +1,92 @@ +// CMG gunset - IN USE +/obj/item/storage/box/gunset/blueshield + name = "Blueshield's CMG-1 gunset" + w_class = WEIGHT_CLASS_NORMAL + +/obj/item/storage/box/gunset/blueshield/PopulateContents() + . = ..() + new /obj/item/gun/ballistic/automatic/cmg/nomag(src) + new /obj/item/ammo_box/magazine/multi_sprite/cmg(src) + new /obj/item/ammo_box/magazine/multi_sprite/cmg(src) + new /obj/item/ammo_box/magazine/multi_sprite/cmg/lethal(src) + new /obj/item/ammo_box/magazine/multi_sprite/cmg/lethal(src) + new /obj/item/suppressor/nanotrasen(src) + +//suppressor for the CMG +/obj/item/suppressor/nanotrasen + name = "NT-S suppressor" + desc = "A Nanotrasen brand small-arms suppressor, including a large NT logo stamped on the side." + + +// ----------- +// Unused guns: +// ----------- + +//Energy Revolver +/obj/item/gun/energy/e_gun/revolver //The virgin gun. + name = "energy revolver" + desc = "An advanced energy revolver with the capacity to shoot both electrodes and lasers." + force = 7 + ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) + ammo_x_offset = 1 + charge_sections = 4 + fire_delay = 4 + icon = 'modular_skyrat/modules/blueshield/icons/energy.dmi' + icon_state = "bsgun" + inhand_icon_state = "minidisable" + lefthand_file = 'modular_skyrat/modules/blueshield/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/blueshield/icons/guns_righthand.dmi' + obj_flags = UNIQUE_RENAME + cell_type = /obj/item/stock_parts/cell/blueshield + pin = /obj/item/firing_pin/implant/mindshield + selfcharge = TRUE + +/obj/item/stock_parts/cell/blueshield + name = "internal revolver power cell" + maxcharge = 1500 + chargerate = 300 + +//PDW-9 taser pistol +/obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun. + name = "PDW-9 taser pistol" + desc = "A military grade energy sidearm, used by many militia forces throughout the local sector. It comes with an internally recharging battery which is slow to recharge." + ammo_x_offset = 2 + icon_state = "pdw9pistol" + inhand_icon_state = null + cell_type = /obj/item/stock_parts/cell/pdw9 + +/obj/item/stock_parts/cell/pdw9 + name = "internal pistol power cell" + maxcharge = 1000 + chargerate = 300 + var/obj/item/gun/energy/e_gun/revolver/pdw9/parent + +/obj/item/stock_parts/cell/pdw9/Initialize(mapload) + . = ..() + parent = loc + +/obj/item/stock_parts/cell/pdw9/process() + . = ..() + parent.update_icon() + +//Allstar SC-3 PDW 'Hellfire' +/obj/item/gun/energy/laser/hellgun/blueshield + name = "\improper Allstar SC-3 PDW 'Hellfire'" + desc = "A prototype energy carbine, despite NT's ban on hellfire weaponry due to negative press. \ + Allstar continued to work on it, compacting it into a small form-factor for personal defense. \ + As part of the Asset Retention Program created by Nanotrasen, Allstar's prototype began to be put into use." + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi' + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + icon_state = "hellfirepdw" + worn_icon_state = "hellfirepdw" + ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire/bs) + +/obj/item/gun/energy/laser/hellgun/blueshield/give_manufacturer_examine() + AddComponent(/datum/component/manufacturer_examine, COMPANY_ALLSTAR) + +/obj/item/ammo_casing/energy/laser/hellfire/bs + projectile_type = /obj/projectile/beam/laser/hellfire + e_cost = 83 //Lets it squeeze out a few more shots + select_name = "maim" diff --git a/modular_skyrat/modules/blueshield/icons/blueshieldpacks.dmi b/modular_skyrat/modules/blueshield/icons/backpacks.dmi similarity index 100% rename from modular_skyrat/modules/blueshield/icons/blueshieldpacks.dmi rename to modular_skyrat/modules/blueshield/icons/backpacks.dmi diff --git a/tgstation.dme b/tgstation.dme index aae62be4a96..9f255fac56a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5684,12 +5684,12 @@ #include "modular_skyrat\modules\blastwave_outfits\code\clothing\blastwave_suit.dm" #include "modular_skyrat\modules\blastwave_outfits\code\clothing\blastwave_uniform.dm" #include "modular_skyrat\modules\blueshield\code\blueshield.dm" -#include "modular_skyrat\modules\blueshield\code\blueshield_closet.dm" -#include "modular_skyrat\modules\blueshield\code\blueshield_clothing.dm" +#include "modular_skyrat\modules\blueshield\code\closet.dm" +#include "modular_skyrat\modules\blueshield\code\clothing.dm" #include "modular_skyrat\modules\blueshield\code\encryptionkey.dm" #include "modular_skyrat\modules\blueshield\code\landmarks.dm" #include "modular_skyrat\modules\blueshield\code\medkit.dm" -#include "modular_skyrat\modules\blueshield\code\special.dm" +#include "modular_skyrat\modules\blueshield\code\weapons.dm" #include "modular_skyrat\modules\bluespace_miner\code\bluespace_miner.dm" #include "modular_skyrat\modules\bodyparts\code\_mutant_bodyparts.dm" #include "modular_skyrat\modules\bodyparts\code\akula_bodyparts.dm"