diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 08b684f80be..976101c1179 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -120,3 +120,8 @@ /obj/item/ammo_casing/energy/nanite/cryo projectile_type = /obj/projectile/energy/cryo select_name = "cryo" + +/obj/item/ammo_casing/energy/laser/blueshield + projectile_type = /obj/projectile/beam/laser + e_cost = 120 + select_name = "kill" diff --git a/modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi b/modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi index bc77592a879..fad176ed5fc 100644 Binary files a/modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi and b/modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi differ diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm index b7dd317bbb8..c7df4570b67 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield.dm @@ -54,6 +54,8 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses backpack_contents = list( /obj/item/storage/box/gunset/blueshield = 1, + /obj/item/gun/energy/e_gun/revolver = 1, + /obj/item/storage/medkit/tactical/blueshield = 1, /obj/item/melee/baton/security/loaded = 1,) implants = list(/obj/item/implant/mindshield) backpack = /obj/item/storage/backpack/blueshield @@ -62,8 +64,9 @@ head = /obj/item/clothing/head/beret/blueshield box = /obj/item/storage/box/survival/security belt = /obj/item/modular_computer/pda/security + r_pocket = /obj/item/flashlight/seclite - id = /obj/item/card/id/advanced/silver //BUBBER EDIT original: obj/item/card/id/advanced/CENTCOM + id = /obj/item/card/id/advanced/centcom id_trim = /datum/id_trim/job/blueshield /datum/outfit/plasmaman/blueshield diff --git a/modular_skyrat/modules/blueshield/code/medkit.dm b/modular_skyrat/modules/blueshield/code/medkit.dm index 8f71ce15d75..d9d42e0df0e 100644 --- a/modular_skyrat/modules/blueshield/code/medkit.dm +++ b/modular_skyrat/modules/blueshield/code/medkit.dm @@ -6,7 +6,10 @@ 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/stack/medical/suture(src) + new /obj/item/stack/medical/mesh(src) + new /obj/item/storage/pill_bottle/probital(src) new /obj/item/healthanalyzer(src) new /obj/item/pinpointer/crew(src) + +//Probably won't need that many things diff --git a/modular_skyrat/modules/blueshield/code/special.dm b/modular_skyrat/modules/blueshield/code/special.dm index 187b193c865..e8e0d2d7a3e 100644 --- a/modular_skyrat/modules/blueshield/code/special.dm +++ b/modular_skyrat/modules/blueshield/code/special.dm @@ -1,13 +1,13 @@ /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/revolver) + name = "X-R12 energy revolver" + desc = "An experimental model advanced energy weapon with the capacity to shoot both electrodes and lasers, used by many private defense contractors from Romulus to New Moscow, its also rather heavy and would certainly hurt to get pistol whipped by." + force = 22 + ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/blueshield) ammo_x_offset = 1 charge_sections = 4 fire_delay = 4 icon = 'modular_skyrat/modules/blueshield/icons/energy.dmi' - icon_state = "bsgun" + icon_state = "blueshieldalt" inhand_icon_state = "minidisable" lefthand_file = 'modular_skyrat/modules/blueshield/icons/guns_lefthand.dmi' righthand_file = 'modular_skyrat/modules/blueshield/icons/guns_righthand.dmi' @@ -15,10 +15,13 @@ cell_type = /obj/item/stock_parts/cell/blueshield pin = /obj/item/firing_pin/implant/mindshield selfcharge = TRUE + w_class = WEIGHT_CLASS_NORMAL + worn_icon = modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi + worn_icon_state = "bsrevolver" /obj/item/stock_parts/cell/blueshield name = "internal revolver power cell" - maxcharge = 1000 + maxcharge = 1200 chargerate = 300 /obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun. @@ -31,7 +34,7 @@ /obj/item/stock_parts/cell/pdw9 name = "internal pistol power cell" - maxcharge = 1000 + maxcharge = 1500 chargerate = 300 var/obj/item/gun/energy/e_gun/revolver/pdw9/parent diff --git a/modular_skyrat/modules/blueshield/icons/energy.dmi b/modular_skyrat/modules/blueshield/icons/energy.dmi index 85194b40854..1f734dac921 100644 Binary files a/modular_skyrat/modules/blueshield/icons/energy.dmi and b/modular_skyrat/modules/blueshield/icons/energy.dmi differ