From cdf14a47eac078b4ec554a16949cd61e72406dc1 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Sat, 28 Mar 2015 20:09:49 -0400 Subject: [PATCH] CentComm Equip Update - Death Commandos now actually use the Death Commando frequency. - Death Commandos have had their medical kits replaced with nanite hyposprays. - CentComm officers now spawn with a pulse pistol on their belt as opposed to the useless base parent egun they got before. - Remove the NT Rep equip option, as it's already available under the 'as job..' option. - Merge the Spec Ops and Death Squad officer equip option - Fixes the madmin malt's hellwater having the wrong ID. --- code/modules/admin/verbs/debug.dm | 119 +++--------------- code/modules/admin/verbs/striketeam.dm | 6 +- .../admin/verbs/striketeam_syndicate.dm | 2 +- .../reagents/reagent_containers/food/cans.dm | 2 +- 4 files changed, 23 insertions(+), 106 deletions(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index b6e0a386cf5..6676ce80dff 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -574,12 +574,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that "red wizard", "marisa wizard", "emergency response team", - "nanotrasen representative", "nanotrasen officer", "nanotrasen captain", - "singuloth knight", - "deathsquad officer - combat", - "deathsquad officer - formal" + "singuloth knight" ) var/dostrip = input("Do you want to strip [M] before equipping them? (0=no, 1=yes)", "STRIPTEASE") as null|anything in list(0,1) @@ -835,31 +832,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if("syndicate commando") M.equip_syndicate_commando() - if("nanotrasen representative") - M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(M), slot_w_uniform) - M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes) - M.equip_if_possible(new /obj/item/clothing/gloves/color/white(M), slot_gloves) - M.equip_if_possible(new /obj/item/device/radio/headset/heads/ntrep(M), slot_l_ear) - - var/obj/item/device/pda/heads/ntrep/pda = new(M) - pda.owner = M.real_name - pda.ownjob = "Nanotrasen Navy Representative" - pda.name = "PDA-[M.real_name] ([pda.ownjob])" - - M.equip_if_possible(pda, slot_r_store) - M.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(M), slot_l_store) - M.equip_if_possible(new /obj/item/weapon/clipboard(M), slot_belt) - - var/obj/item/weapon/card/id/W = new(M) - W.name = "[M.real_name]'s ID Card (Nanotrasen Navy Representative)" - W.icon_state = "centcom" - W.item_state = "id_inv" - W.access = get_all_accesses() - W.assignment = "Nanotrasen Navy Representative" - W.access = get_centcom_access(W.assignment) - W.registered_name = M.real_name - M.equip_if_possible(W, slot_wear_id) - if("nanotrasen officer") M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/officer(M), slot_w_uniform) M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes) @@ -874,7 +846,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(pda, slot_r_store) M.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(M), slot_l_store) - M.equip_if_possible(new /obj/item/weapon/gun/energy(M), slot_belt) + M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_belt) var/obj/item/weapon/card/id/centcom/W = new(M) W.name = "[M.real_name]'s ID Card (Nanotrasen Navy Officer)" @@ -898,7 +870,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(pda, slot_r_store) M.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(M), slot_l_store) - M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt) + M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_belt) var/obj/item/weapon/card/id/centcom/W = new(M) W.name = "[M.real_name]'s ID Card (Nanotrasen Navy Captain)" @@ -958,24 +930,24 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(src), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/cyber(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/dualsaber/red(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(src), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/zipties(src), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_in_backpack) - var/obj/item/device/pda/centcom/pda = new(M) - pda.owner = M.real_name - pda.ownjob = "Special Operations Officer" - pda.icon_state = "pda-syndi" - pda.name = "PDA-[M.real_name] ([pda.ownjob])" - pda.desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition designed for military field work." - - M.equip_if_possible(pda, slot_wear_pda) var/obj/item/weapon/card/id/W = new(M) - W.name = "[M.real_name]'s ID Card (Special Operations Officer)" + W.name = "[M.real_name]'s ID Card" W.icon_state = "centcom" W.assignment = "Special Operations Officer" W.access = get_centcom_access(W.assignment) @@ -985,11 +957,15 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if("special ops formal") M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/captain(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(src), slot_l_ear) - M.equip_if_possible(new /obj/item/clothing/gloves/color/white(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/cyber(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_r_store) + M.equip_if_possible(new /obj/item/weapon/melee/telebaton(M), slot_l_store) var/obj/item/device/pda/centcom/pda = new(M) pda.owner = M.real_name @@ -1089,65 +1065,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) - if("deathsquad officer - combat") - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate/combat(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad/officer(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(src), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/cyber(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_r_store) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) - - M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(src), slot_in_backpack) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack) - M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/dualsaber/red(M), slot_in_backpack) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_in_backpack) - - var/obj/item/weapon/card/id/W = new(M) - W.name = "[M.real_name]'s ID Card (Deathsquad Officer)" - W.icon_state = "centcom" - W.assignment = "Deathsquad Officer" - W.access = get_centcom_access(W.assignment) - W.registered_name = M.real_name - M.equip_to_slot_or_del(W, slot_wear_id) - - - if("deathsquad officer - formal") - M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/captain(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/cyber(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(src), slot_l_ear) - M.equip_if_possible(new /obj/item/clothing/gloves/color/white(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_in_backpack) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_in_backpack) - - var/obj/item/device/pda/heads/pda = new(M) - pda.owner = M.real_name - pda.ownjob = "Deathsquad Officer" - pda.icon_state = "pda-syndi" - pda.name = "PDA-[M.real_name] ([pda.ownjob])" - pda.desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition designed for military field work." - pda.default_cartridge = /obj/item/weapon/cartridge/captain - - M.equip_if_possible(pda, slot_wear_pda) - - M.equip_if_possible(new /obj/item/weapon/melee/telebaton(M), slot_r_store) - - var/obj/item/weapon/card/id/W = new(M) - W.name = "[M.real_name]'s ID Card (Deathsquad Officer)" - W.icon_state = "centcom" - W.assignment = "Deathsquad Officer" - W.access = get_centcom_access(W.assignment) - W.registered_name = M.real_name - M.equip_to_slot_or_del(W, slot_wear_id) - M.regenerate_icons() log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].") diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index 71e1ee4b38c..92a883faf1c 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -86,7 +86,7 @@ var/global/sent_strike_team = 0 //new /obj/item/weapon/gun/energy/pulse_rifle(L.loc) var/obj/item/weapon/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.name = "Spec. Ops Manual" P.icon = "pamphlet-ds" for (var/obj/effect/landmark/L in landmarks_list) @@ -125,7 +125,7 @@ var/global/sent_strike_team = 0 /mob/living/carbon/human/proc/equip_death_commando(leader_selected = 0) var/obj/item/device/radio/R = new /obj/item/device/radio/headset/alt(src) - R.set_frequency(1441) + R.set_frequency(DTH_FREQ) equip_to_slot_or_del(R, slot_l_ear) if (leader_selected == 0) equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform) @@ -142,7 +142,7 @@ var/global/sent_strike_team = 0 equip_to_slot_or_del(new /obj/item/weapon/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/weapon/storage/firstaid/regular(src), slot_in_backpack) + equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_in_backpack) if (!leader_selected) diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index b61e3573b9f..270c3d8c4f1 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -150,7 +150,7 @@ var/global/sent_syndicate_strike_team = 0 equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m762, slot_in_backpack) equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m45(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack) + equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_in_backpack) if (!syndicate_leader_selected) diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 208cfbf4629..59416310061 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -192,7 +192,7 @@ icon_state = "madminmalt" New() ..() - reagents.add_reagent("hellwater", 20) + reagents.add_reagent("hell_water", 20) reagents.add_reagent("neurotoxin", 15) reagents.add_reagent("thirteenloko", 15) src.pixel_x = rand(-10.0, 10)