diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 364c72031ad..52877118b88 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -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, "You short out the safeties on [src]!") - else - to_chat(user, "You reset the safeties on [src]!") - -/obj/item/harmalarm/attack_self(mob/user) - var/safety = !emagged - if(cooldown > world.time) - to_chat(user, "The device is still recharging!") - return - - if(isrobot(user)) - var/mob/living/silicon/robot/R = user - if(!R.cell || R.cell.charge < 1200) - to_chat(user, "You don't have enough charge to do this!") - return - R.cell.use(1000) - if(R.emagged) - safety = FALSE - - if(safety) - user.visible_message("[user] blares out a near-deafening siren from its speakers!", \ - "The siren pierces your hearing and confuses you!", \ - "The siren pierces your hearing!") - for(var/mob/living/carbon/M in get_mobs_in_view(9, user)) - if(!M.check_ear_prot()) - M.AdjustConfused(6) - audible_message("HUMAN HARM") - 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, "
NOTICE - Peacekeeping 'HARM ALARM' used by: [user]
") - - else - user.audible_message("BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT") - 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' diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 39f646fcd28..ef0fd7b01c8 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -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, "It currently holds [matter]/10 cookie-units.") - -/obj/item/cookiesynth/attackby() - return - -/obj/item/cookiesynth/emag_act(mob/user) - emagged = !emagged - if(emagged) - to_chat(user, "You short out [src]'s reagent safety checker!") - else - to_chat(user, "You reset [src]'s reagent safety checker!") - 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, "Cookie Synthesizer Hacked.") - else if(P.emagged && !toxin) - toxin = TRUE - to_chat(user, "Cookie Synthesizer Hacked.") - else - toxin = FALSE - to_chat(user, "Cookie Synthesizer Reset.") - -/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, "[src] doesn't have enough matter left. Wait for it to recharge!") - return - if(isrobot(user)) - var/mob/living/silicon/robot/R = user - if(!R.cell || R.cell.charge < 400) - to_chat(user, "You do not have enough power to use [src].") - 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 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 3d059dc0a5a..8affd317c6a 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -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 diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 48731a3e161..ab7c4ff9562 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -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" diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm index 60c20c65e26..7edb9f67fcf 100644 --- a/code/modules/reagents/chemistry/reagents/misc.dm +++ b/code/modules/reagents/chemistry/reagents/misc.dm @@ -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" diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 31ff92373da..4256b27e762 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -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, "You feel confused and disorientated.") - 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, "You feel like you should sit down and take a rest...") - return ..() - /datum/reagent/gluttonytoxin name = "Gluttony's Blessing" id = "gluttonytoxin" diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index eeb948cb359..8338253fc6c 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -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) diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index 7a2057bb92f..738fb1e0933 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ