diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index fb6ca1b2fa4..32bf7da3c7a 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -1,6 +1,6 @@ /obj/item/device/radio/headset name = "radio headset" - desc = "An updated, modular intercom that fits over the head. Takes encryption keys" + desc = "An updated, modular intercom that fits over the head. Takes encryption keys." icon_state = "headset" item_state = "headset" g_amt = 0 @@ -28,6 +28,13 @@ if(H.l_ear == src || H.r_ear == src) return ..(freq, level) return -1 + +/obj/item/device/radio/headset/alt + name = "bowman headset" + desc = "An updated, modular intercom that fits over the head. Takes encryption keys. Protects ears from flashbangs." + flags = EARBANGPROTECT + icon_state = "com_headset_alt" + item_state = "com_headset_alt" /obj/item/device/radio/headset/syndicate origin_tech = "syndicate=3" @@ -217,12 +224,19 @@ keyslot1 = new /obj/item/device/encryptionkey/heads/blueshield /obj/item/device/radio/headset/ert - name = "CentCom Response Team headset" + name = "emergency response team headset" desc = "The headset of the boss's boss. Channels are as follows: :h - Response Team :c - command, :s - security, :e - engineering, :d - mining, :u - cargo, :z - service, :m - medical, :n - science." icon_state = "com_headset" item_state = "headset" freerange = 1 keyslot1 = new /obj/item/device/encryptionkey/ert + +/obj/item/device/radio/headset/ert/alt + name = "\proper emergency response team's bowman headset" + desc = "The headset of the boss. Protects ears from flashbangs. \nChannels are as follows: :h - Response Team, :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science." + flags = EARBANGPROTECT + icon_state = "com_headset_alt" + item_state = "com_headset_alt" //The below was ported from Baystation. /obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway. diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 2ccf68efd5a..3b82543e80a 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -289,7 +289,7 @@ proc/trigger_armed_response_team(var/force = 0) /mob/living/carbon/human/proc/equip_strike_team(leader_selected = 0) //Special radio setup - equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_l_ear) + equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(src), slot_l_ear) //Replaced with new ERT uniform equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 2991d32164c..4bc608f2cc6 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -803,7 +803,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that 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/hop(M), slot_l_ear) + 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 @@ -877,7 +877,7 @@ 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/under/rank/centcom_officer(M), slot_w_uniform) 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/swat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) @@ -900,7 +900,7 @@ 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/under/rank/centcom_officer(M), slot_w_uniform) 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/swat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) @@ -924,7 +924,7 @@ 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/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(src), slot_l_ear) + 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/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) @@ -952,7 +952,7 @@ 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(src), slot_l_ear) + 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/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) @@ -985,7 +985,7 @@ 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/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(src), slot_l_ear) + 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) @@ -1011,7 +1011,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if("hawke - 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(src), slot_l_ear) + 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) diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index 41b6a84df5e..8968e71b722 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -124,7 +124,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(src) + var/obj/item/device/radio/R = new /obj/item/device/radio/headset/alt(src) R.set_frequency(1441) equip_to_slot_or_del(R, slot_l_ear) if (leader_selected == 0) diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 291ed7d8619..b80e8e8a9b0 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -26,9 +26,6 @@ Blob.process() /datum/event/blob/tick() - if(!Blob) - kill() - return if(IsMultiple(activeFor, 3)) Blob.process() var/blobs = 0 @@ -36,6 +33,9 @@ blobs++ if(blobs >= 3) announce_nuke() + if(!Blob && !blobs) + kill() + return /datum/event/blob/proc/announce_nuke() var/nukecode = "ERROR"