Good morning soldier!. This compact guide will familiarize you with standard operating procedure. There are three basic rules to follow:
#1 Work as a team.
#2 Accomplish your objective at all costs.
#3 Leave no witnesses.
Your mission objective will be relayed to you by Central Command through your headsets or in person.
If deemed appropriate, Central Command will also allow members of your team to use mechs for the mission. You will find the mech storage due East of your position.
In the event that the team does not accomplish their assigned objective in a timely manner, or finds no other way to do so, attached below are instructions on how to operate a Nanotrasen Nuclear Device. Your operations LEADER is provided with a nuclear authentication disk, and all commandos have pinpointer for locating it. You may easily recognize them by their rank: Lieutenant, Captain, or Major. The nuclear device itself will be present somewhere on your destination.
Hello and thank you for choosing Nanotrasen for your nuclear information needs. Today's crash course will deal with the operation of a Fission Class Nanotrasen made Nuclear Device.
First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done to unbolt it one must completely log in which at this time may not be possible.
To make the device functional:
#1 Place bomb in designated detonation zone
#2 Extend and anchor bomb (attack with hand).
#3 Insert Nuclear Auth. Disk into slot.
#4 Enter the nuclear authorization code: ([nuke_code]).
#5 Enter your desired time until activation.
#6 Disable the Safety.
#6 Arm the device.
You now have activated the device and it will begin counting down to detonation. Remove the Nuclear Authorization Disk and either head back to your shuttle or stay around until the Nuclear Device detonates, depending on your orders from Central Command.
The nuclear authorization code is: [nuke_code ? nuke_code : "None provided"]
Good luck, soldier!
" + P.name = "Special Operations Manual" + P.update_icon() + var/obj/item/stamp/centcom/stamp = new + P.stamp(stamp) + qdel(stamp) + + message_admins("[key_name_admin(proccaller)] has spawned a DeathSquad.") + log_admin("[key_name(proccaller)] used Spawn Death Squad.") + return TRUE + +/client/proc/deathsquad_spawn(mob/ghost_mob, is_leader = FALSE, datum/async_input/new_dstype_input, obj/L, nuke_code, mission) + var/new_dstype + if(new_dstype_input) + new_dstype_input.close() + new_dstype = new_dstype_input.result + if(!new_dstype_input) // didn't receive any response, or didn't ask them in the first place + new_dstype = "Organic" + + var/use_ds_borg = FALSE + if(new_dstype == "Cyborg") + use_ds_borg = TRUE + + if(!ghost_mob || !ghost_mob.key || !ghost_mob.client) // Doublechecking after async request + return + + if(use_ds_borg) + var/mob/living/silicon/robot/deathsquad/R = new(get_turf(L)) + var/rnum = rand(1, 1000) + var/borgname = "Epsilon [rnum]" + R.name = borgname + R.custom_name = borgname + R.real_name = R.name + R.mind = new + R.mind.current = R + R.mind.set_original_mob(R) + R.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD + R.mind.special_role = SPECIAL_ROLE_DEATHSQUAD + R.mind.offstation_role = TRUE + if(!(R.mind in SSticker.minds)) + SSticker.minds += R.mind + SSticker.mode.traitors += R.mind + R.key = ghost_mob.key + if(nuke_code) + R.mind.store_memory("Nuke Code: [nuke_code].") + R.mind.store_memory("Mission: [mission].") + to_chat(R, "You are a Deathsquad cyborg, in the service of Central Command. \nYour current mission is: [mission]") + else + var/mob/living/carbon/human/new_commando = create_deathsquad_commando(L, is_leader) + new_commando.mind.key = ghost_mob.key + new_commando.key = ghost_mob.key + new_commando.update_action_buttons_icon() + if(nuke_code) + new_commando.mind.store_memory("Nuke Code: [nuke_code].") + new_commando.mind.store_memory("Mission: [mission].") + to_chat(new_commando, "You are a Deathsquad [is_leader ? "TEAM LEADER" : "commando"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: [mission]") + +/client/proc/create_deathsquad_commando(obj/spawn_location, is_leader = FALSE) + var/mob/living/carbon/human/new_commando = new(spawn_location.loc) + var/commando_leader_rank = pick("Lieutenant", "Captain", "Major") + var/commando_name = pick(GLOB.deathsquad_names) + var/obj/item/organ/external/head/head_organ = new_commando.get_organ("head") // This appearance code is brought to you by ert.dm, basically the same code. If you change something here change somethere there too. + + if(is_leader) + new_commando.age = rand(35, 45) + new_commando.real_name = "[commando_leader_rank] [commando_name]" + else + new_commando.real_name = "[commando_name]" + + if(prob(50)) + new_commando.change_gender(MALE) + else + new_commando.change_gender(FEMALE) + + // All of this code down here too is also from ert.dm, I'm lazy don't blame me + new_commando.set_species(/datum/species/human, TRUE) + new_commando.dna.ready_dna(new_commando) + new_commando.cleanSE() //No fat/blind/colourblind/epileptic/whatever Deathsquad. + new_commando.overeatduration = 0 + + var/hair_c = pick("#8B4513","#000000","#FF4500","#FFD700") // Brown, black, red, blonde + var/eye_c = pick("#000000","#8B4513","1E90FF") // Black, brown, blue + var/skin_tone = rand(-120, 20) // A range of skin colors (This doesn't work, result is always pale white) + + head_organ.facial_colour = hair_c + head_organ.sec_facial_colour = hair_c + head_organ.hair_colour = hair_c + head_organ.sec_hair_colour = hair_c + new_commando.change_eye_color(eye_c) + new_commando.s_tone = skin_tone + head_organ.h_style = random_hair_style(new_commando.gender, head_organ.dna.species.name) + head_organ.f_style = random_facial_hair_style(new_commando.gender, head_organ.dna.species.name) + + new_commando.regenerate_icons() + new_commando.update_body() + new_commando.update_dna() + + //Creates mind stuff. + new_commando.mind_initialize() + new_commando.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD + new_commando.mind.special_role = SPECIAL_ROLE_DEATHSQUAD + new_commando.mind.offstation_role = TRUE + SSticker.mode.traitors |= new_commando.mind //Adds them to current traitor list. Which is really the extra antagonist list. + new_commando.equip_deathsquad_commando(is_leader) + return new_commando + +/mob/living/carbon/human/proc/equip_deathsquad_commando(is_leader = FALSE) + if(is_leader) + equipOutfit(/datum/outfit/admin/deathsquad_commando/leader) + else + equipOutfit(/datum/outfit/admin/deathsquad_commando) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index b2cd3e0658d..a5d6c1f1f4f 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -297,76 +297,6 @@ return 1 */ -/datum/admins/proc/makeDeathsquad() - var/list/mob/candidates = list() - var/mob/theghost = null - var/time_passed = world.time - var/input = "Purify the station." - if(prob(10)) - input = "Save Runtime and any other cute things on the station." - - var/antnum = input(owner, "How many deathsquad members you want to create? Enter 0 to cancel.","Amount:", 0) as num - if(!antnum || antnum <= 0) - return - log_admin("[key_name(owner)] tried making a [antnum] person Death Squad with One-Click-Antag") - message_admins("[key_name_admin(owner)] tried making a [antnum] person Death Squad with One-Click-Antag") - - var/syndicate_leader_selected = 0 //when the leader is chosen. The last person spawned. - - //Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos. - for(var/mob/G in GLOB.respawnable_list) - if(!jobban_isbanned(G, ROLE_SYNDICATE)) - spawn(0) - switch(alert(G,"Do you wish to be considered for an elite syndicate strike team being sent in?","Please answer in 30 seconds!","Yes","No")) - if("Yes") - if((world.time-time_passed)>300)//If more than 30 game seconds passed. - return - candidates += G - if("No") - return - else - return - sleep(300) - - for(var/mob/dead/observer/G in candidates) - if(!G.key) - candidates.Remove(G) - - if(candidates.len) - //Spawns commandos and equips them. - for(var/obj/effect/landmark/L in /area/syndicate_mothership/elite_squad) - if(antnum <= 0) - break - if(L.name == "Syndicate-Commando") - syndicate_leader_selected = antnum == 1?1:0 - - var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected) - - while((!theghost || !theghost.client) && candidates.len) - theghost = pick(candidates) - candidates.Remove(theghost) - - if(!theghost) - qdel(new_syndicate_commando) - break - - new_syndicate_commando.key = theghost.key - new_syndicate_commando.internal = new_syndicate_commando.s_store - new_syndicate_commando.update_action_buttons_icon() - - //So they don't forget their code or mission. - - - to_chat(new_syndicate_commando, "You are an Elite Syndicate. [!syndicate_leader_selected ? "commando" : "LEADER"] in the service of the Syndicate. \nYour current mission is: [input]") - - antnum-- - - for(var/obj/effect/landmark/L in /area/shuttle/syndicate_elite) - if(L.name == "Syndicate-Commando-Bomb") - new /obj/effect/spawner/newbomb/timer/syndicate(L.loc) - return 1 - - /proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character if(!G_found || !G_found.key) return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 489c6ecee76..2b569d689de 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -465,9 +465,8 @@ Traitors and the like can also be revived with the previous role mostly intact. new_character.loc = get_turf(synd_spawn) call(/datum/game_mode/proc/equip_syndicate)(new_character) - if("Death Commando")//Leaves them at late-join spawn. - new_character.equip_death_commando() - new_character.internal = new_character.s_store + if("Deathsquad Commando")//Leaves them at late-join spawn. + new_character.equip_deathsquad_commando() new_character.update_action_buttons_icon() else//They may also be a cyborg or AI. switch(new_character.mind.assigned_role) diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm deleted file mode 100644 index d9c60392b70..00000000000 --- a/code/modules/admin/verbs/striketeam.dm +++ /dev/null @@ -1,204 +0,0 @@ -//STRIKE TEAMS - -#define COMMANDOS_POSSIBLE 6 //if more Commandos are needed in the future -GLOBAL_VAR_INIT(sent_strike_team, 0) - -/client/proc/strike_team() - if(!SSticker) - to_chat(usr, "The game hasn't started yet!") - return - if(GLOB.sent_strike_team == 1) - to_chat(usr, "CentComm is already sending a team.") - return - if(alert("Do you want to send in the CentComm death squad? Once enabled, this is irreversible.",,"Yes","No")!="Yes") - return - alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned commandos have internals cameras which are viewable through a monitor inside the Spec. Ops. Office. The first one selected/spawned will be the team leader.") - - message_admins("[key_name_admin(usr)] has started to spawn a CentComm DeathSquad.", 1) - - var/input = null - while(!input) - input = sanitize(copytext(input(src, "Please specify which mission the death commando squad shall undertake.", "Specify Mission", ""),1,MAX_MESSAGE_LEN)) - if(!input) - if(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes") - return - - if(GLOB.sent_strike_team) - to_chat(usr, "Looks like someone beat you to it.") - return - - // Find the nuclear auth code - var/nuke_code - var/temp_code - for(var/obj/machinery/nuclearbomb/N in GLOB.machines) - temp_code = text2num(N.r_code) - if(temp_code)//if it's actually a number. It won't convert any non-numericals. - nuke_code = N.r_code - break - - // Find ghosts willing to be DS - var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_deathsquad") - var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, COMMANDOS_POSSIBLE, "Join the DeathSquad?",, 21, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source) - if(!length(commando_ghosts)) - to_chat(usr, "Nobody volunteered to join the DeathSquad.") - return - - GLOB.sent_strike_team = 1 - - // Spawns commandos and equips them. - var/commando_number = COMMANDOS_POSSIBLE //for selecting a leader - var/is_leader = TRUE // set to FALSE after leader is spawned - - for(var/obj/effect/landmark/spawner/ds/L in GLOB.landmarks_list) - if(!commando_number) - break - - if(!length(commando_ghosts)) - break - - var/use_ds_borg = FALSE - var/mob/ghost_mob = pick(commando_ghosts) - commando_ghosts -= ghost_mob - if(!ghost_mob || !ghost_mob.key || !ghost_mob.client) - continue - - if(!is_leader) - var/new_dstype = alert(ghost_mob.client, "Select Deathsquad Type.", "DS Character Generation", "Organic", "Cyborg") - if(new_dstype == "Cyborg") - use_ds_borg = TRUE - - if(!ghost_mob || !ghost_mob.key || !ghost_mob.client) // Have to re-check this due to the above alert() call - continue - - if(use_ds_borg) - var/mob/living/silicon/robot/deathsquad/R = new(get_turf(L)) - var/rnum = rand(1, 1000) - var/borgname = "Epsilon [rnum]" - R.name = borgname - R.custom_name = borgname - R.real_name = R.name - R.mind = new - R.mind.current = R - R.mind.set_original_mob(R) - R.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD - R.mind.special_role = SPECIAL_ROLE_DEATHSQUAD - R.mind.offstation_role = TRUE - if(!(R.mind in SSticker.minds)) - SSticker.minds += R.mind - SSticker.mode.traitors += R.mind - R.key = ghost_mob.key - if(nuke_code) - R.mind.store_memory("Nuke Code: [nuke_code].") - R.mind.store_memory("Mission: [input].") - to_chat(R, "You are a Special Operations cyborg, in the service of Central Command. \nYour current mission is: [input]") - else - var/mob/living/carbon/human/new_commando = create_death_commando(L, is_leader) - new_commando.mind.key = ghost_mob.key - new_commando.key = ghost_mob.key - new_commando.internal = new_commando.s_store - new_commando.update_action_buttons_icon() - if(nuke_code) - new_commando.mind.store_memory("Nuke Code: [nuke_code].") - new_commando.mind.store_memory("Mission: [input].") - to_chat(new_commando, "You are a Special Ops [is_leader ? "TEAM LEADER" : "commando"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: [input]") - - is_leader = FALSE - commando_number-- - - //Spawns the rest of the commando gear. - for(var/obj/effect/landmark/spawner/commando_manual/L in GLOB.landmarks_list) - //new /obj/item/gun/energy/pulse_rifle(L.loc) - var/obj/item/paper/P = new(L.loc) - P.info = "Good morning soldier!. This compact guide will familiarize you with standard operating procedure. There are three basic rules to follow:
#1 Work as a team.
#2 Accomplish your objective at all costs.
#3 Leave no witnesses.
You are fully equipped and stocked for your mission--before departing on the Spec. Ops. Shuttle due South, make sure that all operatives are ready. Actual mission objective will be relayed to you by Central Command through your headsets.
If deemed appropriate, Central Command will also allow members of your team to equip assault power-armor for the mission. You will find the armor storage due West of your position. Once you are ready to leave, utilize the Special Operations shuttle console and toggle the hull doors via the other console.
In the event that the team does not accomplish their assigned objective in a timely manner, or finds no other way to do so, attached below are instructions on how to operate a Nanotrasen Nuclear Device. Your operations LEADER is provided with a nuclear authentication disk and a pin-pointer for this reason. You may easily recognize them by their rank: Lieutenant, Captain, or Major. The nuclear device itself will be present somewhere on your destination.
Hello and thank you for choosing Nanotrasen for your nuclear information needs. Today's crash course will deal with the operation of a Fission Class Nanotrasen made Nuclear Device.
First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done to unbolt it one must completely log in which at this time may not be possible.
To make the device functional:
#1 Place bomb in designated detonation zone
#2 Extend and anchor bomb (attack with hand).
#3 Insert Nuclear Auth. Disk into slot.
#4 Type numeric code into keypad ([nuke_code]).
Note: If you make a mistake press R to reset the device.
#5 Press the E button to log onto the device.
You now have activated the device. To deactivate the buttons at anytime, for example when you have already prepped the bomb for detonation, remove the authentication disk OR press the R on the keypad. Now the bomb CAN ONLY be detonated using the timer. A manual detonation is not an option.
Note: Toggle off the SAFETY.
Use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.
Note: THE BOMB IS STILL SET AND WILL DETONATE
Now before you remove the disk if you need to move the bomb you can: Toggle off the anchor, move it, and re-anchor.
The nuclear authorization code is: [nuke_code ? nuke_code : "None provided"]
Good luck, soldier!
" - P.name = "Spec. Ops Manual" - P.icon = "pamphlet-ds" - var/obj/item/stamp/centcom/stamp = new - P.stamp(stamp) - qdel(stamp) - - for(var/thing in GLOB.landmarks_list) - var/obj/effect/landmark/L = thing - if(L.name == "Commando-Bomb") - new /obj/effect/spawner/newbomb/timer/syndicate(L.loc) - qdel(L) - - message_admins("[key_name_admin(usr)] has spawned a CentComm DeathSquad.", 1) - log_admin("[key_name(usr)] used Spawn Death Squad.") - return 1 - -/client/proc/create_death_commando(obj/spawn_location, is_leader = FALSE) - var/mob/living/carbon/human/new_commando = new(spawn_location.loc) - var/commando_leader_rank = pick("Lieutenant", "Captain", "Major") - var/commando_name = pick(GLOB.commando_names) - - var/datum/character_save/S = new //Randomize appearance for the commando. - S.randomise() - if(is_leader) - S.age = rand(35, 45) - S.real_name = "[commando_leader_rank] [commando_name]" - else - S.real_name = "[commando_name]" - S.copy_to(new_commando) - - - new_commando.dna.ready_dna(new_commando)//Creates DNA. - - //Creates mind stuff. - new_commando.mind_initialize() - new_commando.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD - new_commando.mind.special_role = SPECIAL_ROLE_DEATHSQUAD - SSticker.mode.traitors |= new_commando.mind//Adds them to current traitor list. Which is really the extra antagonist list. - new_commando.equip_death_commando(is_leader) - return new_commando - -/mob/living/carbon/human/proc/equip_death_commando(is_leader = FALSE) - - var/obj/item/radio/R = new /obj/item/radio/headset/alt(src) - R.set_frequency(DTH_FREQ) - R.requires_tcomms = FALSE - R.instant = TRUE - R.freqlock = TRUE - equip_to_slot_or_del(R, slot_l_ear) - if(is_leader) - equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform) - else - equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform) - equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/advance(src), slot_shoes) - equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad(src), slot_wear_suit) - equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves) - equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad(src), slot_head) - equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(src), slot_wear_mask) - equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses) - - equip_to_slot_or_del(new /obj/item/storage/backpack/security(src), slot_back) - equip_to_slot_or_del(new /obj/item/storage/box(src), slot_in_backpack) - - equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/flashlight(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack) - if(is_leader) - equip_to_slot_or_del(new /obj/item/disk/nuclear/unrestricted(src), slot_in_backpack) - else - equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), slot_in_backpack) - - - equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber(src), slot_l_store) - equip_to_slot_or_del(new /obj/item/shield/energy(src), slot_r_store) - equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double(src), slot_s_store) - equip_to_slot_or_del(new /obj/item/gun/projectile/revolver/mateba(src), slot_belt) - equip_to_slot_or_del(new /obj/item/gun/energy/pulse(src), slot_r_hand) - - var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(src) - L.implant(src) - - var/obj/item/card/id/W = new(src) - W.name = "[real_name]'s ID Card" - W.icon_state = "deathsquad" - W.assignment = "Death Commando" - W.access = get_centcom_access(W.assignment) - W.registered_name = real_name - equip_to_slot_or_del(W, slot_wear_id) - - return 1 diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index b10ebf2af93..e9e66f49abc 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -14,7 +14,7 @@ strip_delay = 70 resistance_flags = NONE -/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads +/obj/item/clothing/shoes/combat/swat //overpowered gimmick boots name = "\improper SWAT shoes" desc = "High speed, no drag combat boots." permeability_coefficient = 0.01 diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 7ba8e52b7f9..645f10a63a9 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -39,7 +39,7 @@ //Deathsquad space suit, not hardsuits because no flashlight! /obj/item/clothing/head/helmet/space/deathsquad - name = "deathsquad helmet" + name = "Deathsquad helmet" desc = "That's not red paint. That's real blood." icon_state = "deathsquad" item_state = "deathsquad" @@ -53,12 +53,13 @@ strip_delay = 130 /obj/item/clothing/suit/space/deathsquad - name = "deathsquad suit" + name = "Deathsquad suit" desc = "A heavily armored, advanced space suit that protects against most forms of damage." icon_state = "deathsquad" item_state = "swat_suit" - allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/tank/internals,/obj/item/kitchen/knife/combat) + allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/tank/internals,/obj/item/kitchen/knife/combat,/obj/item/flashlight) armor = list(MELEE = 80, BULLET = 80, LASER = 50, ENERGY = 50, BOMB = 100, BIO = 100, RAD = 100, FIRE = 100, ACID = 100) + flags_inv = HIDESHOES | HIDEJUMPSUIT | HIDETAIL max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF strip_delay = 130 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 84b4d93558c..6da70fa990a 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -104,6 +104,15 @@ sensor_mode = SENSOR_COORDS random_sensor = FALSE +/obj/item/clothing/under/rank/deathsquad + name = "\improper Deathsquad jumpsuit" + desc = "It's decorative jumpsuit worn by the Deathsquad. A small tag at the bottom reads \"Not associated with Nanotrasen\". " + icon_state = "officer" + item_state = "g_suit" + item_color = "officer" + sensor_mode = SENSOR_OFF // You think the Deathsquad wants to be seen? + random_sensor = FALSE + /obj/item/clothing/under/rank/centcom_commander name = "\improper CentComm commander's jumpsuit" desc = "It's a jumpsuit worn by CentComm's highest-tier Commanders." diff --git a/config/names/death_commando.txt b/config/names/deathsquad.txt similarity index 91% rename from config/names/death_commando.txt rename to config/names/deathsquad.txt index 9c6905e8b2a..ad56c52d689 100644 --- a/config/names/death_commando.txt +++ b/config/names/deathsquad.txt @@ -1,69 +1,73 @@ -Killiam Shakespeare -Stabby McGee -Sgt. Slaughter -Maxx Power -Sir Killaslot -Slab Bulkhead -Fridge Largemeat -Punt Speedchunk -Butch Deadlift -Bold Bigflank -Splint Chesthair -Flint Ironstag -Bolt Vanderhuge -Thick McRunfast -Blast Hardcheese -Buff Drinklots -Trunk Slamchest -Fist Rockbone -Stump Beefgnaw -Smash Lampjaw -Punch Rockgroin -Buck Plankchest -Stump Chunkman -Dirk Hardpeck -Rip Steakface -Slate Slabrock -Crud Bonemeal -Brick Hardmeat -Rip Sidecheek -Punch Sideiron -Gristle McThornBody -Slake Fistcrunch -Buff Hardback -Blast Thickneck -Crunch Buttsteak -Slab Squatthrust -Lump Beefrock -Touch Rustrod -Reef Blastbody -Smoke Manmuscle -Beat Punchbeef -Pack Blowfist -Roll Fizzlebeef -Lance Killiam -George Melons -Maximilian Murderface -Bob Johnson -Crush McStompbones -Hank Chesthair -Killing McKillingalot -Rex Dudekiller VII -Seamus McTosterone -Hans Testosteroneson -Max Pain -Theodore Pain -Sarah Pain -GORE Vidal -Leonardo Da Viking -Noam Bombsky -Al "Otta" Gore -Gibbs McLargehuge -Evil Martin Luther King -Evil Bob Marley -Duke Killington -AMERICA -Toolboxl Rose -Zombie Gandhi -A whole bunch of spiders in a SWAT suit -THAT DAMN TRAITOR GEORGE MELONS \ No newline at end of file +Killiam Shakespeare +Stabby McGee +Sgt. Slaughter +Maxx Power +Sir Killaslot +Slab Bulkhead +Fridge Largemeat +Punt Speedchunk +Butch Deadlift +Bold Bigflank +Splint Chesthair +Flint Ironstag +Bolt Vanderhuge +Thick McRunfast +Blast Hardcheese +Buff Drinklots +Trunk Slamchest +Fist Rockbone +Stump Beefgnaw +Smash Lampjaw +Punch Rockgroin +Buck Plankchest +Stump Chunkman +Dirk Hardpeck +Rip Steakface +Slate Slabrock +Crud Bonemeal +Brick Hardmeat +Rip Sidecheek +Punch Sideiron +Gristle McThornBody +Slake Fistcrunch +Buff Hardback +Blast Thickneck +Crunch Buttsteak +Slab Squatthrust +Lump Beefrock +Touch Rustrod +Reef Blastbody +Smoke Manmuscle +Beat Punchbeef +Pack Blowfist +Roll Fizzlebeef +Lance Killiam +George Melons +Maximilian Murderface +Bob Johnson +Crush McStompbones +Hank Chesthair +Killing McKillingalot +Rex Dudekiller VII +Seamus McTosterone +Hans Testosteroneson +Max Pain +Theodore Pain +Sarah Pain +GORE Vidal +Leonardo Da Viking +Noam Bombsky +Al "Otta" Gore +Gibbs McLargehuge +Evil Martin Luther King +Evil Bob Marley +Duke Killington +AMERICA +Toolboxl Rose +Zombie Gandhi +A whole bunch of spiders in a SWAT suit +THAT DAMN TRAITOR GEORGE MELONS +Hank Tank +Brickhouse Thunderlung +Colossus Crushtacean +Maxx Capp diff --git a/paradise.dme b/paradise.dme index d77d971fba9..de2c30f4a65 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1207,6 +1207,7 @@ #include "code\modules\admin\verbs\cinematic.dm" #include "code\modules\admin\verbs\custom_event.dm" #include "code\modules\admin\verbs\deadsay.dm" +#include "code\modules\admin\verbs\deathsquad.dm" #include "code\modules\admin\verbs\debug.dm" #include "code\modules\admin\verbs\diagnostics.dm" #include "code\modules\admin\verbs\dice.dm" @@ -1230,7 +1231,6 @@ #include "code\modules\admin\verbs\randomverbs.dm" #include "code\modules\admin\verbs\serialization.dm" #include "code\modules\admin\verbs\space_transitions.dm" -#include "code\modules\admin\verbs\striketeam.dm" #include "code\modules\admin\verbs\striketeam_syndicate.dm" #include "code\modules\admin\verbs\ticklag.dm" #include "code\modules\admin\verbs\toggledebugverbs.dm"