From 501df6d69e7b59a3c5515b27457ecbb322159f2f Mon Sep 17 00:00:00 2001 From: David Winters Date: Wed, 28 Apr 2021 08:35:03 -0400 Subject: [PATCH] clown items removed to make way for separate PR --- .../objects/items/weapons/clown_items_vr.dm | 22 ---- code/modules/mob/living/bot/honkbot.dm | 117 ------------------ icons/obj/aibots_vr.dmi | Bin 851 -> 0 bytes 3 files changed, 139 deletions(-) delete mode 100644 code/game/objects/items/weapons/clown_items_vr.dm delete mode 100644 code/modules/mob/living/bot/honkbot.dm delete mode 100644 icons/obj/aibots_vr.dmi diff --git a/code/game/objects/items/weapons/clown_items_vr.dm b/code/game/objects/items/weapons/clown_items_vr.dm deleted file mode 100644 index 3d48e6c8de1..00000000000 --- a/code/game/objects/items/weapons/clown_items_vr.dm +++ /dev/null @@ -1,22 +0,0 @@ -/obj/item/weapon/storage/box/clown - name = "clown box" - desc = "A colorful cardboard box for the clown." - icon = 'icons/obj/storage_vr.dmi' - icon_state = "clownbox" - -/obj/item/stack/material/cardboard/ - var/result = /obj/item/weapon/storage/box/clown - -/obj/item/stack/material/cardboard/attackby(obj/item/I as obj, mob/living/user as mob) - ..() - if(contents.len) - return - if(amount >= 2) - to_chat(user, "Do you really want to stamp all of those? Just grab one.") - else - if(istype(I, /obj/item/weapon/stamp/clown)) - if(!user.item_is_in_hands(src)) - to_chat(user, "You'll need [src] in your hands to do that.") - else - new result(get_turf(src)) - qdel(src) \ No newline at end of file diff --git a/code/modules/mob/living/bot/honkbot.dm b/code/modules/mob/living/bot/honkbot.dm deleted file mode 100644 index f664e6876e8..00000000000 --- a/code/modules/mob/living/bot/honkbot.dm +++ /dev/null @@ -1,117 +0,0 @@ -//TODO: make this not bad -/mob/living/bot/honkbot - name = "\improper honkbot" - health = 20 - maxHealth = 20 - icon = 'icons/obj/aibots_vr.dmi' - icon_state = "honkbot" - layer = MOB_LAYER-0.1 - var/wet_floors = 0 - var/last_newpatient_speak = 0 - -/mob/living/bot/honkbot/handleIdle() - if(prob(10)) - custom_emote(2, "honks.") - playsound(src, 'sound/items/bikehorn.ogg', 50, 0) - if(istype(loc, /turf/simulated)) - if(wet_floors) - if(istype(loc, /turf/simulated)) - var/turf/simulated/T = loc - T.wet_floor() - -/mob/living/bot/honkbot/Crossed(atom/movable/AM as mob|obj) - if(AM.is_incorporeal()) - return - if(istype(AM, /mob/living)) - var/mob/living/M = AM - M.slip("the [src.name]",4) - playsound(src, 'sound/items/bikehorn.ogg', 50, 0) - -/mob/living/bot/honkbot/handleIdle() - if(prob(2)) - custom_emote(2, "honks!") - playsound(src, 'sound/machines/synth_yes.ogg', 50, 0) - -/mob/living/bot/honkbot/explode() - on = 0 - visible_message("[src] blows apart!") - var/turf/Tsec = get_turf(src) - - new /obj/item/weapon/reagent_containers/glass/bucket(Tsec) - new /obj/item/device/assembly/prox_sensor(Tsec) - if(prob(50)) - new /obj/item/robot_parts/l_arm(Tsec) - - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(3, 1, src) - s.start() - //playsound(src, 'sound/items/bikehorn.ogg', 50, 0) //todo: find party horn sound - qdel(src) - return - -/mob/living/bot/honkbot/lookForTargets() - for(var/mob/living/carbon/human/H in view(7, src)) // Time to find a patient! - if(confirmTarget(H)) - target = H - if(last_newpatient_speak + 30 SECONDS < world.time) - var/message_options = list( - "Hey, [H.name]. Why can't I see the ceiling?", - "I may have dropped out of Harvard, but they say laughter is the best medicine!", - "Psst, [H.name]. I know who you are. Hail Honkmother." - ) - var/message = pick(message_options) - say(message) - playsound(src, 'sound/items/bikehorn.ogg', 50, 0) - last_newpatient_speak = world.time - break - -/mob/living/bot/honkbot/attack_hand(var/mob/user) - tgui_interact(user) - -/mob/living/bot/honkbot/tgui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "Cleanbot", name) - ui.open() - -/mob/living/bot/honkbot/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) - var/list/data = ..() - data["on"] = on - data["open"] = open - data["locked"] = locked - - data["patrol"] = will_patrol - - data["wet_floors"] = wet_floors - data["version"] = "v2.0" - return data - -/mob/living/bot/honkbot/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) - if(..()) - return TRUE - usr.set_machine(src) - add_fingerprint(usr) - switch(action) - if("start") - if(on) - turn_off() - else - turn_on() - . = TRUE - if("patrol") - will_patrol = !will_patrol - patrol_path = null - . = TRUE - if("wet_floors") - wet_floors = !wet_floors - to_chat(usr, "You twiddle the screw.") - . = TRUE - -/mob/living/bot/honkbot/emag_act(var/remaining_uses, var/mob/user) - . = ..() - if(!wet_floors) - if(user) - to_chat(user, "The [src] buzzes and beeps.") - playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0) - wet_floors = 1 - return 1 \ No newline at end of file diff --git a/icons/obj/aibots_vr.dmi b/icons/obj/aibots_vr.dmi deleted file mode 100644 index 9ce200b21cda95c926c5c04b3e4ceb7a27fccc8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 851 zcmV-Z1FZasP)|NsB;e;B$2 z1+ucTW&i+l007}^4FCZD|Nj9005di=HUR$s@X-JO007%5IBjihH8nK=%m5;>OfWJn zQ&mmv93-@`jClY600DGTPE!Ct=GbNc005(UR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9` z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+BR?-Y zDZfNFRf&r;C9|j)C}zmTnO2mTn+jr^0Yy`D5-UN%I&jFvnVVmhnwy$e0#=S;STc6Q zFjX27tI&X0h4BSN`4yE!t4=J+B~~pib;=5^elFm!2LP3YZwFM0l_+`GLy(|9{ad~>g?q-m1qmq~$ZFT`$-1!e!b9dsv5khWKj6^ z`a2rn-HYP0Fh2Y8`0mWJFV8Rx!!XP>;e3Ge0nP_FAK-jI)7#&_i1~oce{(*-`2gnw zoDVPz^FJv^to7vnFrb8$p4?w4Xx0i)Q5nNJPX-j6S|EaP1DmH00KK&WyG;hL_)84X ztrg}07QF@A{$4fc)(Z0g3!a(}oEvm&#mqM_>#6xb)1X}|W(KJJWB_VD&^0)(6+g$* z%m9_g0fwHM53~)swPMvNxJW)wo%8mf1714u=&D`z^n5_*4{g>8yy>7E{j9ZkdOjeA zS3OLAR$DwdAE2%s^n8H2cC5+=_Qw64i1qWW`#XIAT0TG?fSM1`2cYHy