cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 01:23:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

removal of peacekeeper

Browse Source
This commit is contained in:
Fox McCloud
2021-09-17 22:04:28 -04:00
parent 338eb1963e
commit b38a1e2fd7
8 changed files with 3 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_items.dm
-72
View File
@@ -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'
code/game/objects/items/weapons/RSF.dm
-72
View File
@@ -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