mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
removal of peacekeeper
This commit is contained in:
Fox McCloud
@@ -44,7 +44,6 @@
|
||||
var/ccooldown = 0
|
||||
var/scooldown = 0
|
||||
var/shockallowed = FALSE //Can it be a stunarm when emagged. Only PK borgs get this by default.
|
||||
var/boop = FALSE
|
||||
|
||||
/obj/item/borg/cyborghug/attack_self(mob/living/user)
|
||||
if(isrobot(user))
|
||||
@@ -136,82 +135,11 @@
|
||||
user.cell.use(300)
|
||||
ccooldown = world.time + 10
|
||||
|
||||
/obj/item/borg/cyborghug/peacekeeper
|
||||
shockallowed = TRUE
|
||||
|
||||
/obj/item/borg/cyborghug/medical
|
||||
boop = TRUE
|
||||
|
||||
#undef CYBORG_HUGS
|
||||
#undef CYBORG_HUG
|
||||
#undef CYBORG_SHOCK
|
||||
#undef CYBORG_CRUSH
|
||||
|
||||
/obj/item/harmalarm
|
||||
name = "\improper Sonic Harm Prevention Tool"
|
||||
desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH."
|
||||
icon = 'icons/obj/device.dmi'
|
||||
icon_state = "megaphone"
|
||||
var/cooldown = 0
|
||||
|
||||
/obj/item/harmalarm/emag_act(mob/user)
|
||||
emagged = !emagged
|
||||
if(emagged)
|
||||
to_chat(user, "<font color='red'>You short out the safeties on [src]!</font>")
|
||||
else
|
||||
to_chat(user, "<font color='red'>You reset the safeties on [src]!</font>")
|
||||
|
||||
/obj/item/harmalarm/attack_self(mob/user)
|
||||
var/safety = !emagged
|
||||
if(cooldown > world.time)
|
||||
to_chat(user, "<font color='red'>The device is still recharging!</font>")
|
||||
return
|
||||
|
||||
if(isrobot(user))
|
||||
var/mob/living/silicon/robot/R = user
|
||||
if(!R.cell || R.cell.charge < 1200)
|
||||
to_chat(user, "<span class='warning'>You don't have enough charge to do this!</span>")
|
||||
return
|
||||
R.cell.use(1000)
|
||||
if(R.emagged)
|
||||
safety = FALSE
|
||||
|
||||
if(safety)
|
||||
user.visible_message("<font color='red' size='2'>[user] blares out a near-deafening siren from its speakers!</font>", \
|
||||
"<span class='userdanger'>The siren pierces your hearing and confuses you!</span>", \
|
||||
"<span class='danger'>The siren pierces your hearing!</span>")
|
||||
for(var/mob/living/carbon/M in get_mobs_in_view(9, user))
|
||||
if(!M.check_ear_prot())
|
||||
M.AdjustConfused(6)
|
||||
audible_message("<font color='red' size='7'>HUMAN HARM</font>")
|
||||
playsound(get_turf(src), 'sound/ai/harmalarm.ogg', 70, 3)
|
||||
cooldown = world.time + 200
|
||||
log_game("[key_name(user)] used a Cyborg Harm Alarm in ([AREACOORD(user)])")
|
||||
if(isrobot(user))
|
||||
var/mob/living/silicon/robot/R = user
|
||||
if(R.connected_ai)
|
||||
to_chat(R.connected_ai, "<br><span class='notice'>NOTICE - Peacekeeping 'HARM ALARM' used by: [user]</span><br>")
|
||||
|
||||
else
|
||||
user.audible_message("<font color='red' size='7'>BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT</font>")
|
||||
for(var/mob/living/carbon/human/H in get_mobs_in_view(9, user))
|
||||
var/earsafety = FALSE
|
||||
if(H.check_ear_prot())
|
||||
earsafety = TRUE
|
||||
|
||||
if(earsafety)
|
||||
H.AdjustConfused(5)
|
||||
H.AdjustStuttering(10)
|
||||
H.Jitter(10)
|
||||
else
|
||||
H.Weaken(2)
|
||||
H.AdjustConfused(10)
|
||||
H.AdjustStuttering(15)
|
||||
H.Jitter(25)
|
||||
playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
|
||||
cooldown = world.time + 600
|
||||
log_game("[key_name(user)] used an emagged Cyborg Harm Alarm in ([AREACOORD(user)])")
|
||||
|
||||
/obj/item/borg/overdrive
|
||||
name = "Overdrive"
|
||||
icon = 'icons/obj/decals.dmi'
|
||||
|
||||
@@ -82,75 +82,3 @@ RSF
|
||||
playsound(loc, 'sound/machines/click.ogg', 10, 1)
|
||||
var/type_path = configured_items[mode][3]
|
||||
new type_path(spawn_location)
|
||||
|
||||
/obj/item/cookiesynth
|
||||
name = "\improper Cookie Synthesizer"
|
||||
desc = "A self-recharging device used to rapidly deploy cookies."
|
||||
icon = 'icons/obj/tools.dmi'
|
||||
icon_state = "rcd"
|
||||
var/matter = 10
|
||||
var/toxin = FALSE
|
||||
var/cooldown = 0
|
||||
var/cooldowndelay = 10
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
/obj/item/cookiesynth/examine(mob/user)
|
||||
. = ..()
|
||||
to_chat(user, "<span class='notice'>It currently holds [matter]/10 cookie-units.</span>")
|
||||
|
||||
/obj/item/cookiesynth/attackby()
|
||||
return
|
||||
|
||||
/obj/item/cookiesynth/emag_act(mob/user)
|
||||
emagged = !emagged
|
||||
if(emagged)
|
||||
to_chat(user, "<span class='warning'>You short out [src]'s reagent safety checker!</span>")
|
||||
else
|
||||
to_chat(user, "<span class='warning'>You reset [src]'s reagent safety checker!</span>")
|
||||
toxin = FALSE
|
||||
|
||||
/obj/item/cookiesynth/attack_self(mob/user)
|
||||
var/mob/living/silicon/robot/P = null
|
||||
if(isrobot(user))
|
||||
P = user
|
||||
if(emagged && !toxin)
|
||||
toxin = TRUE
|
||||
to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
|
||||
else if(P.emagged && !toxin)
|
||||
toxin = TRUE
|
||||
to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
|
||||
else
|
||||
toxin = FALSE
|
||||
to_chat(user, "<span class='notice'>Cookie Synthesizer Reset.</span>")
|
||||
|
||||
/obj/item/cookiesynth/process()
|
||||
if(matter < 10)
|
||||
matter++
|
||||
|
||||
/obj/item/cookiesynth/afterattack(atom/A, mob/user, proximity)
|
||||
if(cooldown > world.time)
|
||||
return
|
||||
if(!proximity)
|
||||
return
|
||||
if(!(istype(A, /obj/structure/table) || isfloorturf(A)))
|
||||
return
|
||||
if(matter < 1)
|
||||
to_chat(user, "<span class='warning'>[src] doesn't have enough matter left. Wait for it to recharge!</span>")
|
||||
return
|
||||
if(isrobot(user))
|
||||
var/mob/living/silicon/robot/R = user
|
||||
if(!R.cell || R.cell.charge < 400)
|
||||
to_chat(user, "<span class='warning'>You do not have enough power to use [src].</span>")
|
||||
return
|
||||
var/turf/T = get_turf(A)
|
||||
playsound(loc, 'sound/machines/click.ogg', 10, 1)
|
||||
to_chat(user, "Fabricating Cookie..")
|
||||
var/obj/item/reagent_containers/food/snacks/cookie/S = new /obj/item/reagent_containers/food/snacks/cookie(T)
|
||||
if(toxin)
|
||||
S.reagents.add_reagent("pancuronium", 2.4)
|
||||
if(isrobot(user))
|
||||
var/mob/living/silicon/robot/R = user
|
||||
R.cell.use(100)
|
||||
else
|
||||
matter--
|
||||
cooldown = world.time + cooldowndelay
|
||||
|
||||
@@ -368,11 +368,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
|
||||
module_sprites["Cricket"] = "Cricket-SEC"
|
||||
status_flags &= ~CANPUSH
|
||||
|
||||
if("Peacekeeper")
|
||||
module = new /obj/item/robot_module/peacekeeper(src)
|
||||
module_sprites["Peacekeeper"] = "peace"
|
||||
status_flags &= ~CANPUSH
|
||||
|
||||
if("Engineering")
|
||||
module = new /obj/item/robot_module/engineering(src)
|
||||
module.channels = list("Engineering" = 1)
|
||||
@@ -425,7 +420,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
|
||||
SSblackbox.record_feedback("tally", "cyborg_modtype", 1, "[lowertext(modtype)]")
|
||||
rename_character(real_name, get_default_name())
|
||||
|
||||
if(modtype == "Medical" || modtype == "Security" || modtype == "Peacekeeper" || modtype == "Combat")
|
||||
if(modtype == "Medical" || modtype == "Security" || modtype == "Combat")
|
||||
status_flags &= ~CANPUSH
|
||||
|
||||
choose_icon(6,module_sprites)
|
||||
@@ -1335,7 +1330,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
|
||||
scrambledcodes = 1
|
||||
req_one_access = list(ACCESS_CENT_SPECOPS)
|
||||
ionpulse = 1
|
||||
force_modules = list("Engineering", "Medical", "Security")
|
||||
force_modules = list("Engineering", "Medical")
|
||||
static_radio_channels = 1
|
||||
allow_rename = FALSE
|
||||
weapons_unlock = TRUE
|
||||
|
||||
@@ -278,7 +278,7 @@
|
||||
/obj/item/borg_defib,
|
||||
/obj/item/handheld_defibrillator,
|
||||
/obj/item/roller_holder,
|
||||
/obj/item/borg/cyborghug/medical,
|
||||
/obj/item/borg/cyborghug,
|
||||
/obj/item/reagent_containers/borghypo,
|
||||
/obj/item/scalpel/laser/laser1,
|
||||
/obj/item/hemostat,
|
||||
@@ -362,21 +362,6 @@
|
||||
if(G)
|
||||
G.drop_gripped_item(silent = TRUE)
|
||||
|
||||
|
||||
// Peacekeeper cyborg module.
|
||||
/obj/item/robot_module/peacekeeper
|
||||
name = "Peacekeeper"
|
||||
module_type = "Standard"
|
||||
basic_modules = list(
|
||||
/obj/item/cookiesynth,
|
||||
/obj/item/harmalarm,
|
||||
/obj/item/reagent_containers/borghypo/peace,
|
||||
/obj/item/holosign_creator/cyborg,
|
||||
/obj/item/borg/cyborghug/peacekeeper,
|
||||
/obj/item/extinguisher
|
||||
/* /obj/item/borg/projectile_dampen*/)
|
||||
emag_modules = list(/obj/item/reagent_containers/borghypo/peace/hacked)
|
||||
|
||||
// Security cyborg module.
|
||||
/obj/item/robot_module/security
|
||||
name = "security robot module"
|
||||
|
||||
@@ -559,12 +559,6 @@
|
||||
REMOVE_TRAIT(M, TRAIT_PACIFISM, id)
|
||||
..()
|
||||
|
||||
/datum/reagent/pax/peaceborg
|
||||
name = "synthpax"
|
||||
id = "synthpax"
|
||||
description = "A colorless liquid that suppresses violence in its subjects. Cheaper to synthesize than normal Pax, but wears off faster."
|
||||
metabolization_rate = 1.5 * REAGENTS_METABOLISM
|
||||
|
||||
/datum/reagent/toxin/coffeepowder
|
||||
name = "Coffee Grounds"
|
||||
id = "coffeepowder"
|
||||
|
||||
@@ -1273,33 +1273,6 @@
|
||||
..()
|
||||
chosen_timer = rand(10, 30)
|
||||
|
||||
/datum/reagent/peaceborg/confuse
|
||||
name = "Dizzying Solution"
|
||||
id = "dizzysolution"
|
||||
description = "Makes the target off balance and dizzy"
|
||||
metabolization_rate = 1.5 * REAGENTS_METABOLISM
|
||||
|
||||
/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/M)
|
||||
M.AdjustConfused(3, bound_lower = 0, bound_upper = 5)
|
||||
M.AdjustDizzy(3, bound_lower = 0, bound_upper = 5)
|
||||
if(prob(20))
|
||||
to_chat(M, "<span class='warning'>You feel confused and disorientated.</span>")
|
||||
return ..()
|
||||
|
||||
/datum/reagent/peaceborg/tire
|
||||
name = "Tiring Solution"
|
||||
id = "tiresolution"
|
||||
description = "An extremely weak stamina-toxin that tires out the target. Completely harmless."
|
||||
metabolization_rate = 1.5 * REAGENTS_METABOLISM
|
||||
|
||||
/datum/reagent/peaceborg/tire/on_mob_life(mob/living/M)
|
||||
var/healthcomp = (M.maxHealth - M.health)
|
||||
if(M.staminaloss < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
|
||||
M.adjustStaminaLoss(10)
|
||||
if(prob(30))
|
||||
to_chat(M, "<span class='warning'>You feel like you should sit down and take a rest...</span>")
|
||||
return ..()
|
||||
|
||||
/datum/reagent/gluttonytoxin
|
||||
name = "Gluttony's Blessing"
|
||||
id = "gluttonytoxin"
|
||||
|
||||
@@ -34,15 +34,6 @@
|
||||
reagent_ids = list("syndicate_nanites", "potass_iodide", "hydrocodone")
|
||||
bypass_protection = 1
|
||||
|
||||
/obj/item/reagent_containers/borghypo/peace
|
||||
name = "Peace Hypospray"
|
||||
reagent_ids = list("dizzysolution", "tiresolution", "synthpax")
|
||||
|
||||
/obj/item/reagent_containers/borghypo/peace/hacked
|
||||
desc = "Everything's peaceful in death!"
|
||||
icon_state = "borghypo_s"
|
||||
reagent_ids = list("dizzysolution", "tiresolution", "synthpax", "tirizene", "sulfonal", "sodium_thiopental", "cyanide", "neurotoxin2")
|
||||
|
||||
/obj/item/reagent_containers/borghypo/New()
|
||||
..()
|
||||
for(var/R in reagent_ids)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 253 KiB |
Reference in New Issue
Block a user