diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 0bf01f05526..d9f4fc6d1a2 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -391,3 +391,73 @@ /obj/item/megaphone/clown = 1, /obj/item/reagent_containers/spray/chemsprayer/janitor/clown = 1, ) + +/datum/outfit/death_commando + name = "Death Commando" + + uniform = /obj/item/clothing/under/rank/centcom/commander + suit = /obj/item/clothing/suit/space/hardsuit/deathsquad + shoes = /obj/item/clothing/shoes/magboots/commando + gloves = /obj/item/clothing/gloves/combat + mask = /obj/item/clothing/mask/gas/sechailer/swat + glasses = /obj/item/clothing/glasses/hud/toggle/thermal + back = /obj/item/storage/backpack/security + l_pocket = /obj/item/melee/transforming/energy/sword/saber + r_pocket = /obj/item/shield/energy + suit_store = /obj/item/tank/internals/emergency_oxygen/double + belt = /obj/item/gun/ballistic/revolver/mateba + l_hand = /obj/item/gun/energy/pulse/loyalpin + id = /obj/item/card/id + ears = /obj/item/radio/headset/headset_cent/alt + + backpack_contents = list(/obj/item/storage/box=1,\ + /obj/item/ammo_box/a357=1,\ + /obj/item/storage/firstaid/regular=1,\ + /obj/item/storage/box/flashbangs=1,\ + /obj/item/flashlight=1,\ + /obj/item/grenade/plastic/x4=1) + +/datum/outfit/death_commando/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(visualsOnly) + return + + var/obj/item/radio/R = H.ears + R.set_frequency(FREQ_CENTCOM) + R.freqlock = TRUE + + var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)//Here you go Deuryn + L.implant(H, null, 1) + + + var/obj/item/card/id/W = H.wear_id + W.icon_state = "centcom" + W.access = get_all_accesses()//They get full station access. + W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access. + W.assignment = "Death Commando" + W.registered_name = H.real_name + W.update_label(W.registered_name, W.assignment) + +/datum/outfit/death_commando/officer + name = "Death Commando Officer" + head = /obj/item/clothing/head/helmet/space/beret + +/datum/outfit/death_commando/doomguy + name = "The Juggernaut" + + suit = /obj/item/clothing/suit/space/hardsuit/shielded/doomguy + shoes = /obj/item/clothing/shoes/jackboots/fast + gloves = /obj/item/clothing/gloves/krav_maga/combatglovesplus + mask = /obj/item/clothing/mask/gas/sechailer + suit_store = /obj/item/gun/energy/pulse/destroyer + belt = /obj/item/storage/belt/grenade/full/webbing + back = /obj/item/storage/backpack/hammerspace + l_pocket = /obj/item/kitchen/knife/combat + r_pocket = /obj/item/tank/internals/emergency_oxygen/double + r_hand = /obj/item/reagent_containers/hypospray/combat/supersoldier + backpack_contents = list(/obj/item/storage/box/engineer=1,\ + /obj/item/reagent_containers/hypospray/combat,\ + /obj/item/radio=1,\ + /obj/item/chainsaw/energy/doom=1,\ + /obj/item/gun/ballistic/automatic/sniper_rifle=1,\ + /obj/item/gun/grenadelauncher/security=1,\ + /obj/item/gun/ballistic/automatic/ar=1) diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index bb30cb9de7d..9c7b6c6abcf 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -144,22 +144,22 @@ /datum/outfit/plasmaman/command name = "Command Plasmamand" - + head = /obj/item/clothing/head/helmet/space/plasmaman/command uniform = /obj/item/clothing/under/plasmaman/command /datum/outfit/plasmaman/ce name = "CE plasmaman" - + head = /obj/item/clothing/head/helmet/space/plasmaman/engineering/ce uniform = /obj/item/clothing/under/plasmaman/engineering/ce - + /datum/outfit/plasmaman/cmo name = "CMO plasmaman" - + head = /obj/item/clothing/head/helmet/space/plasmaman/cmo uniform = /obj/item/clothing/under/plasmaman/cmo - + /datum/outfit/plasmaman/hos name = "HoS plasmaman" @@ -171,19 +171,19 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/rd uniform = /obj/item/clothing/under/plasmaman/rd - + /datum/outfit/plasmaman/hop name = "Hop plasmaman" head = /obj/item/clothing/head/helmet/space/plasmaman/hop uniform = /obj/item/clothing/under/plasmaman/hop - + /datum/outfit/plasmaman/mime name = "Mime plasmaman" head = /obj/item/clothing/head/helmet/space/plasmaman/mime uniform = /obj/item/clothing/under/plasmaman/mime - + /datum/outfit/plasmaman/honk name = "Clown plasmaman" diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index e17d64cf0e2..b42aa09235c 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -390,6 +390,7 @@ r_hand= /obj/item/tank/internals/plasmaman/belt/full mask = /obj/item/clothing/mask/breath +<<<<<<< HEAD /datum/outfit/death_commando name = "Death Commando" @@ -460,6 +461,8 @@ /obj/item/gun/grenadelauncher/security=1,\ /obj/item/gun/ballistic/automatic/ar=1) +======= +>>>>>>> 21f3ec1cd2 (Reponse Team Tweaks (#4749)) /datum/outfit/chrono_agent name = "Timeline Eradication Agent" uniform = /obj/item/clothing/under/color/white diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index be01dd66c3e..97e6032f755 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -58,6 +58,29 @@ icon_state = "syndiemag0" magboot_state = "syndiemag" +/obj/item/clothing/shoes/magboots/commando + desc = "Military-grade magnetic boots that have a lighter magnetic pull, placing less burden on the wearer." + name = "commando magboots" + icon_state = "advmag0" + magboot_state = "advmag" + slowdown_active = SHOES_SLOWDOWN + armor = list("melee" = 40, "bullet" = 30, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 90, "acid" = 50, "stamina" = 30) + clothing_flags = NOSLIP + +/obj/item/clothing/shoes/magboots/commando/attack_self(mob/user) //Code for the passive no-slip of the commando magboots to always apply, kind of a shit code solution though. + if(magpulse) + slowdown = SHOES_SLOWDOWN + else + slowdown = slowdown_active + magpulse = !magpulse + icon_state = "[magboot_state][magpulse]" + to_chat(user, "You [magpulse ? "enable" : "disable"] the mag-pulse traction system.") + user.update_inv_shoes() + user.update_gravity(user.has_gravity()) + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + /obj/item/clothing/shoes/magboots/crushing desc = "Normal looking magboots that are altered to increase magnetic pull to crush anything underfoot." diff --git a/code/modules/clothing/under/jobs/Plasmaman/centcom.dm b/code/modules/clothing/under/jobs/Plasmaman/centcom.dm new file mode 100644 index 00000000000..0d5b97ac92a --- /dev/null +++ b/code/modules/clothing/under/jobs/Plasmaman/centcom.dm @@ -0,0 +1,20 @@ +/obj/item/clothing/under/plasmaman/commander + name = "CentCom commander envirosuit" + desc = "An envirosuit worn by CentCom's highest-tier Commanders." + icon_state = "commander_envirosuit" + item_state = "commander_envirosuit" + item_color = "commander_envirosuit" + +/obj/item/clothing/under/plasmaman/official + name = "CentCom official envirosuit" + desc = "An envirosuit worn by CentCom Officers." + icon_state = "official_envirosuit" + item_state = "official_envirosuit" + item_color = "official_envirosuit" + +/obj/item/clothing/under/plasmaman/intern + name = "CentCom intern envirosuit" + desc = "An envirosuit worn by those interning for CentCom. The top is styled after a polo shirt for easy identification." + icon_state = "intern_envirosuit" + item_state = "intern_envirosuit" + item_color = "intern_envirosuit"