From e056abfb820735309c173dcc7873c252f3b62ea1 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Mon, 25 May 2015 20:16:34 -0400 Subject: [PATCH] 3/3 port done --- code/game/dna/genes/monkey.dm | 14 ++-------- code/game/gamemodes/nuclear/nuclearbomb.dm | 28 +++++++++---------- code/game/machinery/Freezer.dm | 3 -- code/game/machinery/OpTable.dm | 19 ++----------- code/game/machinery/Sleeper.dm | 3 -- code/game/machinery/adv_med.dm | 2 -- code/game/machinery/alarm.dm | 5 ---- code/game/machinery/atmoalter/canister.dm | 3 -- code/game/machinery/atmoalter/pump.dm | 3 -- code/game/machinery/atmoalter/scrubber.dm | 3 -- code/game/machinery/autolathe.dm | 7 ++--- code/game/machinery/bots/medbot.dm | 3 -- code/game/machinery/cloning.dm | 3 +- .../machinery/computer/HolodeckControl.dm | 7 ----- code/game/machinery/computer/atmos_control.dm | 5 +--- code/game/machinery/computer/card.dm | 2 -- code/game/machinery/computer/cloning.dm | 2 -- .../game/machinery/computer/communications.dm | 3 -- code/game/machinery/computer/computer.dm | 14 ---------- code/game/machinery/computer/medical.dm | 2 -- code/game/machinery/computer/pod.dm | 4 --- .../computer/pod_tracking_console.dm | 3 -- code/game/machinery/computer/prisonshuttle.dm | 3 -- code/game/machinery/computer/salvage_ship.dm | 3 -- code/game/machinery/computer/security.dm | 3 -- code/game/machinery/computer/skills.dm | 3 -- .../machinery/computer/specops_shuttle.dm | 3 -- code/game/machinery/computer/store.dm | 2 -- .../computer/syndicate_specops_shuttle.dm | 3 -- code/game/machinery/computer/xenos_shuttle.dm | 27 ++++++++---------- code/game/machinery/door_control.dm | 6 ---- .../embedded_controller_base.dm | 8 ++---- code/game/machinery/flasher.dm | 3 -- code/game/machinery/holosign.dm | 3 -- code/game/machinery/igniter.dm | 7 ----- code/game/machinery/kitchen/gibber.dm | 3 -- code/game/machinery/kitchen/juicer.dm | 3 -- code/game/machinery/kitchen/microwave.dm | 3 -- code/game/machinery/kitchen/smartfridge.dm | 3 -- code/game/machinery/lightswitch.dm | 3 -- code/game/machinery/machinery.dm | 3 -- code/game/machinery/newscaster.dm | 4 --- code/game/machinery/pipe/pipe_dispenser.dm | 3 -- code/game/machinery/recharger.dm | 3 -- code/game/machinery/robot_fabricator.dm | 3 -- code/game/machinery/suit_storage_unit.dm | 8 ------ code/game/machinery/vending.dm | 3 -- code/game/mecha/mecha.dm | 3 -- code/game/mecha/mecha_control_console.dm | 3 -- code/game/objects/effects/aliens.dm | 6 +--- code/game/objects/effects/effect_system.dm | 4 --- code/game/objects/items.dm | 2 +- .../objects/items/devices/radio/intercom.dm | 3 -- code/game/objects/items/policetape.dm | 3 -- .../objects/items/weapons/dna_injector.dm | 3 -- .../objects/items/weapons/grenades/grenade.dm | 3 -- code/game/objects/structures/bedsheet_bin.dm | 4 --- .../structures/crates_lockers/closets.dm | 4 --- .../crates_lockers/closets/fireaxe.dm | 4 --- .../closets/secure/secure_closets.dm | 3 -- code/game/objects/structures/displaycase.dm | 4 +-- code/game/objects/structures/extinguisher.dm | 4 --- code/game/objects/structures/grille.dm | 3 -- code/game/objects/structures/inflatable.dm | 6 ---- code/game/objects/structures/ladders.dm | 3 -- code/game/objects/structures/lamarr_cage.dm | 3 -- code/game/objects/structures/mineral_doors.dm | 3 -- code/game/objects/structures/morgue.dm | 13 ++------- .../structures/stool_bed_chair_nest/bed.dm | 3 -- code/game/objects/structures/tables_racks.dm | 14 ---------- code/game/objects/structures/window.dm | 3 -- code/game/turfs/simulated/floor.dm | 4 --- code/game/turfs/simulated/walls.dm | 16 ----------- code/game/turfs/space/space.dm | 5 +--- code/game/turfs/unsimulated/floor.dm | 3 -- code/game/vehicles/spacepods/spacepod.dm | 2 -- code/modules/clothing/masks/miscellaneous.dm | 9 ------ code/modules/food/candy_maker.dm | 3 -- code/modules/food/grill_new.dm | 3 -- code/modules/food/icecream_vat.dm | 3 -- code/modules/food/oven_new.dm | 3 -- .../mob/living/carbon/alien/alien_defenses.dm | 7 ----- .../living/carbon/human/human_attackpaw.dm | 18 ------------ .../silicon/robot/drone/drone_console.dm | 4 --- .../modules/mob/living/silicon/robot/robot.dm | 4 --- .../mob/living/simple_animal/parrot.dm | 20 +------------ .../mob/living/simple_animal/tribbles.dm | 2 -- code/modules/paperwork/paperbin.dm | 4 --- code/modules/paperwork/stamps.dm | 3 -- code/modules/power/engine.dm | 2 -- code/modules/reagents/Chemistry-Machinery.dm | 9 ------ code/modules/reagents/newchem/toxins.dm | 12 ++++---- .../reagents/reagent_containers/hypospray.dm | 4 --- .../security levels/keycard authentication.dm | 18 +++++------- code/modules/shieldgen/shield_capacitor.dm | 3 -- code/modules/shieldgen/shield_gen.dm | 3 -- code/modules/telesci/telesci_computer.dm | 6 +--- code/modules/virus2/curer.dm | 5 ---- code/modules/virus2/diseasesplicer.dm | 3 -- paradise.dme | 1 - 100 files changed, 57 insertions(+), 480 deletions(-) delete mode 100644 code/modules/mob/living/carbon/human/human_attackpaw.dm diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index 4c711464777..699d40e40bc 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -11,14 +11,11 @@ if(!istype(H,/mob/living/carbon/human)) // testing("Cannot monkey-ify [M], type is [M.type].") return - if(H.monkeyizing) - return for(var/obj/item/W in H) if (W==H.w_uniform) // will be torn continue - H.drop_from_inventory(W) + H.unEquip(W) H.regenerate_icons() - H.monkeyizing = 1 H.canmove = 0 H.stunned = 1 H.icon = null @@ -33,7 +30,6 @@ sleep(48) //animation = null - H.monkeyizing = 0 H.stunned = 0 H.update_canmove() H.invisibility = initial(H.invisibility) @@ -43,7 +39,7 @@ return for(var/obj/item/W in H) - H.drop_from_inventory(W) + H.unEquip(W) H.set_species(H.species.primitive_form) H << "You are now [H.species.name]. " @@ -55,14 +51,11 @@ if(!istype(H,/mob/living/carbon/human)) // testing("Cannot monkey-ify [M], type is [M.type].") return - if(H.monkeyizing) - return for(var/obj/item/W in H) if (W==H.w_uniform) // will be torn continue - H.drop_from_inventory(W) + H.unEquip(W) H.regenerate_icons() - H.monkeyizing = 1 H.canmove = 0 H.stunned = 1 H.icon = null @@ -77,7 +70,6 @@ sleep(48) //animation = null - H.monkeyizing = 0 H.stunned = 0 H.update_canmove() H.invisibility = initial(H.invisibility) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 2fc85d6fe4a..921b765bf75 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -80,7 +80,7 @@ var/bomb_set if (istype(O, /obj/item/device/multitool) || istype(O, /obj/item/weapon/wirecutters)) ui_interact(user) - + if (src.extended) if (istype(O, /obj/item/weapon/disk/nuclear)) usr.drop_item() @@ -159,8 +159,6 @@ var/bomb_set return ..() -/obj/machinery/nuclearbomb/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/machinery/nuclearbomb/attack_hand(mob/user as mob) if (src.extended) @@ -182,9 +180,9 @@ var/bomb_set obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) ui_interact(user) - + /obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - var/data[0] + var/data[0] var/uiwidth var/uiheight var/uititle @@ -197,12 +195,12 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) else data["authstatus"] = "Auth. S2" else - if (src.timing) + if (src.timing) data["authstatus"] = "Set" else data["authstatus"] = "Auth. S1" - data["safe"] = src.safety ? "Safe" : "Engaged" - data["time"] = src.timeleft + data["safe"] = src.safety ? "Safe" : "Engaged" + data["time"] = src.timeleft data["timer"] = src.timing data["safety"] = src.safety data["anchored"] = src.anchored @@ -217,7 +215,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) uititle = "Nuke Control Panel" else data["hacking"] = 1 - var/list/tempwires[0] + var/list/tempwires[0] for(var/wire in src.wires) tempwires.Add(list(list("name" = wire, "cut" = src.wires[wire]))) data["wires"] = tempwires @@ -227,17 +225,17 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) uiwidth = 420 uiheight = 440 uititle = "Nuclear Bomb Defusion" - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "nuclear_bomb.tmpl", uititle, uiwidth, uiheight) - ui.set_initial_data(data) + ui.set_initial_data(data) ui.open() /obj/machinery/nuclearbomb/verb/make_deployable() set category = "Object" set name = "Make Deployable" set src in oview(1) - + if(usr.stat || !usr.canmove || usr.restrained()) return @@ -340,8 +338,8 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) if (src.timing == -1.0) return if (src.safety) - usr << "\red The safety is still on." - nanomanager.update_uis(src) + usr << "\red The safety is still on." + nanomanager.update_uis(src) return src.timing = !( src.timing ) if (src.timing) @@ -429,7 +427,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) if(ticker.mode.name == "nuclear emergency") ticker.mode:nukes_left -- else if(off_station == 1) - world << "A nuclear device was set off, but the explosion was out of reach of the station!" + world << "A nuclear device was set off, but the explosion was out of reach of the station!" else if(off_station == 2) world << "A nuclear device was set off, but the device was not on the station!" else diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index fa44371b82e..3c9d02f0f2e 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -236,9 +236,6 @@ /obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user as mob) src.attack_hand(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_paw(mob/user as mob) - src.attack_hand(user) - /obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) if(panel_open) user << "Close the maintenance panel first." diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 9cdbe1fd662..6369ed99eee 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -42,19 +42,6 @@ if(prob(75)) del(src) -/obj/machinery/optable/attack_paw(mob/user as mob) - if ((HULK in usr.mutations)) - usr << text("\blue You destroy the operating table.") - visible_message("\red [usr] destroys the operating table!") - src.density = 0 - del(src) - if (!( locate(/obj/machinery/optable, user.loc) )) - step(user, get_dir(user, src)) - if (user.loc == src.loc) - user.layer = TURF_LAYER - visible_message("The monkey hides under the table!") - return - /obj/machinery/optable/attack_hand(mob/user as mob) if (HULK in usr.mutations) usr << text("\blue You destroy the table.") @@ -75,13 +62,13 @@ /obj/machinery/optable/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) if(usr.stat || (!ishuman(user) && !isrobot(user)) || user.restrained() || !check_table(user) || user.weakened || user.stunned) return - + if(!ismob(O)) //humans only return - + if(istype(O, /mob/living/simple_animal) || istype(O, /mob/living/silicon)) //animals and robots dont fit return - + var/mob/living/L = O take_victim(L,usr) return diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index c7d600bf62f..5e4ca5c788d 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -101,9 +101,6 @@ /obj/machinery/sleep_console/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/sleep_console/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/sleep_console/attack_hand(mob/user as mob) if(..()) return diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index d94b779d631..9f0a05974e3 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -340,8 +340,6 @@ default_deconstruction_crowbar(G) -/obj/machinery/body_scanconsole/attack_paw(user as mob) - return src.attack_hand(user) /obj/machinery/body_scanconsole/attack_ai(user as mob) return src.attack_hand(user) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 83381796495..b1fcd04cd08 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1109,8 +1109,6 @@ FIRE ALARM /obj/machinery/firealarm/bullet_act(BLAH) return src.alarm() -/obj/machinery/firealarm/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/machinery/firealarm/emp_act(severity) if(prob(50/severity)) alarm() @@ -1368,9 +1366,6 @@ Just a object used in constructing fire alarms return master_area=A -/obj/machinery/partyalarm/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/machinery/partyalarm/attack_hand(mob/user as mob) if((user.stat && !isobserver(user)) || stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 99782c1b022..29746472c85 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -376,9 +376,6 @@ update_flag src.add_hiddenprint(user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/canister/attack_paw(var/mob/user as mob) - return src.attack_hand(user) - /obj/machinery/portable_atmospherics/canister/attack_alien(mob/living/carbon/alien/humanoid/user) return diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index aec5d82c346..e5b39164cc3 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -96,9 +96,6 @@ src.add_hiddenprint(user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/pump/attack_paw(var/mob/user as mob) - return src.attack_hand(user) - /obj/machinery/portable_atmospherics/pump/attack_hand(var/mob/user as mob) user.set_machine(src) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 4821ef4f15b..02abbe87d92 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -150,9 +150,6 @@ src.add_hiddenprint(user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/scrubber/attack_paw(var/mob/user as mob) - return src.attack_hand(user) - /obj/machinery/portable_atmospherics/scrubber/attack_hand(var/mob/user as mob) user.set_machine(src) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 6c13db51ad5..7392804f585 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -168,9 +168,6 @@ busy = 0 src.updateUsrDialog() -/obj/machinery/autolathe/attack_paw(mob/user) - return attack_hand(user) - /obj/machinery/autolathe/attack_hand(mob/user) if(..(user, 0)) return @@ -292,14 +289,14 @@ /obj/machinery/autolathe/proc/can_build(var/datum/design/D,var/multiplier=1,var/custom_metal,var/custom_glass) var/coeff = get_coeff(D) - + var/metal_amount = m_amount if(custom_metal) metal_amount = custom_metal var/glass_amount = g_amount if(custom_glass) glass_amount = custom_glass - + if(D.materials["$metal"] && (metal_amount < (multiplier*D.materials["$metal"] / coeff))) return 0 if(D.materials["$glass"] && (glass_amount < (multiplier*D.materials["$glass"] / coeff))) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index a3bf925ece1..b228e8b5c0c 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -129,9 +129,6 @@ text_dehack = "You reset [name]'s reagent processor circuits." text_dehack_fail = "[name] seems damaged and does not respond to reprogramming!" -/obj/machinery/bot/medbot/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/machinery/bot/medbot/attack_hand(mob/user as mob) . = ..() if (.) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 2ae38331a7b..f3fd4eba26d 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -165,8 +165,7 @@ /obj/machinery/clonepod/attack_ai(mob/user as mob) return attack_hand(user) -/obj/machinery/clonepod/attack_paw(mob/user as mob) - return attack_hand(user) + /obj/machinery/clonepod/attack_hand(mob/user as mob) if ((isnull(src.occupant)) || (stat & NOPOWER)) return diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index d7293163318..79af00f560d 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -387,9 +387,6 @@ throwpass = 1 //You can throw objects over this, despite it's density. -/obj/structure/table/holotable/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/structure/table/holotable/attack_alien(mob/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N return attack_hand(user) @@ -570,10 +567,6 @@ user << "The station AI is not to interact with these devices" return -/obj/machinery/readybutton/attack_paw(mob/user as mob) - user << "You are too primitive to use this device" - return - /obj/machinery/readybutton/New() ..() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index bce0006f488..81545418638 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -19,9 +19,6 @@ src.add_hiddenprint(user) return interact(user) -/obj/machinery/computer/atmoscontrol/attack_paw(var/mob/user as mob) - return interact(user) - /obj/machinery/computer/atmoscontrol/attack_hand(mob/user) if(..()) return @@ -64,7 +61,7 @@ alarm_list+=alarm for(var/obj/machinery/alarm/alarm in sortAtom(alarm_list)) if(!is_in_filter(alarm.alarm_area.type)) - continue + continue if(!alarm.remote_control) continue if(alarm.hidden) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 6f7c803c359..6d07202395d 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -74,8 +74,6 @@ /obj/machinery/computer/card/attack_ai(var/mob/user as mob) return attack_hand(user) -/obj/machinery/computer/card/attack_paw(var/mob/user as mob) - return attack_hand(user) /obj/machinery/computer/card/attack_hand(mob/user as mob) if(..()) return diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index d5d63057e37..d97d9701321 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -86,8 +86,6 @@ ..() return -/obj/machinery/computer/cloning/attack_paw(mob/user as mob) - return attack_hand(user) /obj/machinery/computer/cloning/attack_ai(mob/user as mob) return attack_hand(user) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index f476181db78..66ee77fcf7d 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -256,9 +256,6 @@ var/shuttle_call/shuttle_calls[0] /obj/machinery/computer/communications/attack_ai(var/mob/user as mob) return src.attack_hand(user) -/obj/machinery/computer/communications/attack_paw(var/mob/user as mob) - return src.attack_hand(user) - /obj/machinery/computer/communications/attack_hand(var/mob/user as mob) if(..(user)) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 03eb5db3dab..c1ec8fb3ddf 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -141,20 +141,6 @@ src.attack_hand(user) return -/obj/machinery/computer/attack_paw(mob/living/user) - user.changeNext_move(CLICK_CD_MELEE) - user.do_attack_animation(src) - if(circuit) - if(prob(10)) - user.visible_message("[user.name] smashes the [src.name] with its paws.",\ - "You smash the [src.name] with your paws.",\ - "You hear a smashing sound.") - set_broken() - return - user.visible_message("[user.name] smashes against the [src.name] with its paws.",\ - "You smash against the [src.name] with your paws.",\ - "You hear a clicking sound.") - /obj/machinery/computer/attack_alien(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 1b094542a42..ab8a43b4973 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -21,8 +21,6 @@ /obj/machinery/computer/med_data/attack_ai(user as mob) return src.attack_hand(user) -/obj/machinery/computer/med_data/attack_paw(user as mob) - return src.attack_hand(user) /obj/machinery/computer/med_data/attack_hand(mob/user as mob) if(..()) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index a813e8d63de..e8b160d26f9 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -120,10 +120,6 @@ return attack_hand(user) -/obj/machinery/computer/pod/attack_paw(var/mob/user as mob) - return attack_hand(user) - - /obj/machinery/computer/pod/attack_hand(var/mob/user as mob) if(..()) return diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 5de9643fd7d..5e5a4b8df9c 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -9,9 +9,6 @@ /obj/machinery/computer/podtracker/attack_ai(var/mob/user as mob) return src.attack_hand(user) -/obj/machinery/computer/podtracker/attack_paw(var/mob/user as mob) - return src.attack_hand(user) - /obj/machinery/computer/podtracker/attack_hand(var/mob/user as mob) if(..()) return diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index a19bc96211d..4e8ad7498f0 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -31,9 +31,6 @@ var/prison_shuttle_timeleft = 0 return src.attack_hand(user) - attack_paw(var/mob/user as mob) - return src.attack_hand(user) - attackby(I as obj, user as mob, params) if(istype(I, /obj/item/weapon/screwdriver)) diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm index 5e0feda0c20..9c2e2b853c4 100644 --- a/code/game/machinery/computer/salvage_ship.dm +++ b/code/game/machinery/computer/salvage_ship.dm @@ -43,9 +43,6 @@ src.add_hiddenprint(user) return attack_hand(user) -/obj/machinery/computer/salvage_ship/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/machinery/computer/salvage_ship/attack_hand(mob/user as mob) if(!allowed(user)) user << "\red Access Denied" diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 4432de9d1cf..b7e009730e5 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -36,9 +36,6 @@ /obj/machinery/computer/secure_data/attack_ai(mob/user as mob) return attack_hand(user) -/obj/machinery/computer/secure_data/attack_paw(mob/user as mob) - return attack_hand(user) - //Someone needs to break down the dat += into chunks instead of long ass lines. /obj/machinery/computer/secure_data/attack_hand(mob/user as mob) if(..()) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 1717a25a92e..21f10e359fc 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -34,9 +34,6 @@ /obj/machinery/computer/skills/attack_ai(mob/user as mob) return attack_hand(user) -/obj/machinery/computer/skills/attack_paw(mob/user as mob) - return attack_hand(user) - //Someone needs to break down the dat += into chunks instead of long ass lines. /obj/machinery/computer/skills/attack_hand(mob/user as mob) if(..()) diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 3f92848f4cd..4c765ecc1b3 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -250,9 +250,6 @@ var/specops_shuttle_timeleft = 0 user << "\red Access Denied." return 1 -/obj/machinery/computer/specops_shuttle/attack_paw(var/mob/user as mob) - return attack_hand(user) - /obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/weapon/card/emag)) user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index 6578eaf8673..2950ca87f11 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -13,8 +13,6 @@ /obj/machinery/computer/merch/New() ..() -/obj/machinery/computer/merch/attack_paw(mob/user as mob) - return attack_hand(user) /obj/machinery/computer/merch/attack_ai(mob/user as mob) src.add_hiddenprint(user) diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 45455b9c663..5ddc7fcaf13 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -184,9 +184,6 @@ var/syndicate_elite_shuttle_timeleft = 0 user << "\red Access Denied." return 1 -/obj/machinery/computer/syndicate_elite_shuttle/attack_paw(var/mob/user as mob) - return attack_hand(user) - /obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/weapon/card/emag)) user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." diff --git a/code/game/machinery/computer/xenos_shuttle.dm b/code/game/machinery/computer/xenos_shuttle.dm index 343c2717b76..0577b0aca7d 100644 --- a/code/game/machinery/computer/xenos_shuttle.dm +++ b/code/game/machinery/computer/xenos_shuttle.dm @@ -24,11 +24,11 @@ moving = 1 lastMove = world.time - + for(var/obj/machinery/door/airlock/alien/A in world) A.close() A.locked = 1 - A.update_icon() + A.update_icon() for(var/mob/M in curr_location) if(M.client) @@ -41,20 +41,20 @@ shake_camera(M, 10, 1) if(istype(M, /mob/living/carbon) && !isalien(M)) if(!M.buckled) - M.Weaken(3) - + M.Weaken(3) + if(curr_location.z != dest_location.z) var/area/transit_location = locate(/area/xenos_station/transit) curr_location.move_contents_to(transit_location) curr_location = transit_location sleep(XENOS_SHUTTLE_MOVE_TIME) - + for(var/obj/machinery/door/airlock/alien/A in world) A.close() - if(dest_location != locate(/area/xenos_station/start)) + if(dest_location != locate(/area/xenos_station/start)) A.locked = 0 - A.update_icon() - + A.update_icon() + var/list/dstturfs = list() var/throwy = world.maxy @@ -78,7 +78,7 @@ for(var/mob/living/simple_animal/pest in dest_location) // And for the other kind of bug... pest.gib() - + curr_location.move_contents_to(dest_location) curr_location = dest_location moving = 0 @@ -91,9 +91,6 @@ /obj/machinery/computer/xenos_station/attack_ai(mob/user as mob) return attack_hand(user) -/obj/machinery/computer/xenos_station/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/machinery/computer/xenos_station/attack_alien(mob/user as mob) return attack_hand(user) @@ -101,7 +98,7 @@ if(!allowed(user)) user << "\red Access denied." return - + if(!isalien(user) && !isrobot(user) && !isAI(user)) user << "You do not know how to operate this terminal." return @@ -128,7 +125,7 @@ /obj/machinery/computer/xenos_station/Topic(href, href_list) if(..()) return 1 - + if(!isliving(usr)) return var/mob/living/user = usr @@ -142,7 +139,7 @@ else if(href_list["station_ne"]) xenos_move_to(/area/xenos_station/northeast) else if(href_list["station_e"]) - xenos_move_to(/area/xenos_station/east) + xenos_move_to(/area/xenos_station/east) else if(href_list["station_sw"]) xenos_move_to(/area/xenos_station/southwest) else if(href_list["station_se"]) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index acd88137ebb..e469e358d2e 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -37,9 +37,6 @@ else user << "Error, no route to host." -/obj/machinery/door_control/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob, params) /* For later implementation if (istype(W, /obj/item/weapon/screwdriver)) @@ -140,9 +137,6 @@ /obj/machinery/driver_button/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/driver_button/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user as mob, params) if(istype(W, /obj/item/device/detective_scanner)) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index ec411753803..e6fb2c03322 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -3,7 +3,7 @@ name = "Embedded Controller" anchored = 1 - + use_power = 1 idle_power_usage = 10 @@ -29,10 +29,6 @@ /obj/machinery/embedded_controller/attack_ai(mob/user as mob) src.ui_interact(user) -/obj/machinery/embedded_controller/attack_paw(mob/user as mob) - user << "You do not have the dexterity to use this." - return - /obj/machinery/embedded_controller/attack_hand(mob/user as mob) src.ui_interact(user) @@ -44,7 +40,7 @@ icon_state = "airlock_control_standby" power_channel = ENVIRON density = 0 - + var/id_tag //var/radio_power_use = 50 //power used to xmit signals diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 2c2458df37b..5322c3da301 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -123,9 +123,6 @@ /obj/machinery/flasher_button/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/flasher_button/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/flasher_button/attackby(obj/item/weapon/W, mob/user as mob, params) return src.attack_hand(user) diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index cd1e5a85e62..687a07ced0f 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -46,9 +46,6 @@ /obj/machinery/holosign_switch/attack_ai(mob/user as mob) return src.attack_hand(user) -/ -obj/machinery/holosign_switch/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/machinery/holosign_switch/attackby(obj/item/weapon/W, mob/user as mob, params) if(istype(W, /obj/item/device/detective_scanner)) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 598d448d746..434c4d17336 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -13,10 +13,6 @@ /obj/machinery/igniter/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/igniter/attack_paw(mob/user as mob) - if ((ticker && ticker.mode.name == "monkey")) - return src.attack_hand(user) - return /obj/machinery/igniter/attack_hand(mob/user as mob) if(..()) @@ -122,9 +118,6 @@ /obj/machinery/ignition_switch/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/ignition_switch/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/ignition_switch/attackby(obj/item/weapon/W, mob/user as mob, params) return src.attack_hand(user) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index e815ffc3257..00da3c157d7 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -164,9 +164,6 @@ else src.overlays += image('icons/obj/kitchen.dmi', "gridle") -/obj/machinery/gibber/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/gibber/relaymove(mob/user as mob) if(locked) return diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index bf963ea3c0d..2df46989506 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -60,9 +60,6 @@ src.updateUsrDialog() return 0 -/obj/machinery/juicer/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/juicer/attack_ai(mob/user as mob) return 0 diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 1fba31f1da9..dc4e21f9296 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -183,9 +183,6 @@ return 1 src.updateUsrDialog() -/obj/machinery/microwave/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/microwave/attack_ai(mob/user as mob) return 0 diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 523f52bdff2..d1354d17c9d 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -133,9 +133,6 @@ updateUsrDialog() -/obj/machinery/smartfridge/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/machinery/smartfridge/attack_ai(mob/user as mob) return 0 diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 666c49c3e8d..2edd028bde1 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -43,9 +43,6 @@ usr << "A light switch. It is [on? "on" : "off"]." -/obj/machinery/light_switch/attack_paw(mob/user) - src.attack_hand(user) - /obj/machinery/light_switch/attack_hand(mob/user) on = !on diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index a68fe87f068..9651d57e461 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -322,9 +322,6 @@ Class Procs: else return src.attack_hand(user) -/obj/machinery/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/attack_hand(mob/user as mob) if(!interact_offline && stat & (NOPOWER|BROKEN|MAINT)) return 1 diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index bb5c005550a..282ea222d8f 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -744,10 +744,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co return src.attack_hand(user) //or maybe it'll have some special functions? No idea. -/obj/machinery/newscaster/attack_paw(mob/user as mob) - user << "The newscaster controls are far too complicated for your tiny brain!" - return - /obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) if(photo) if(!issilicon(user)) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index d7b47e15aeb..43050cab6ae 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -7,9 +7,6 @@ var/unwrenched = 0 var/wait = 0 -/obj/machinery/pipedispenser/attack_paw(user as mob) - return src.attack_hand(user) - /obj/machinery/pipedispenser/attack_hand(user as mob) if(..()) return diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 944aa0ee312..4ff221e58f5 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -60,9 +60,6 @@ use_power = 1 update_icon() -/obj/machinery/recharger/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/machinery/recharger/process() if(stat & (NOPOWER|BROKEN) || !anchored) return diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 504f7ef8956..4465fdccf81 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -40,9 +40,6 @@ else stat |= NOPOWER -/obj/machinery/robotic_fabricator/attack_paw(user as mob) - return src.attack_hand(user) - /obj/machinery/robotic_fabricator/attack_hand(user as mob) var/dat if (..()) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 957111ea9d4..3aea4a33a6d 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -562,10 +562,6 @@ return src.attack_hand(user) -/obj/machinery/suit_storage_unit/attack_paw(mob/user as mob) - user << "The console controls are far too complicated for your tiny brain!" - return - //////////////////////////////REMINDER: Make it lock once you place some fucker inside. @@ -627,10 +623,6 @@ /obj/machinery/suit_cycler/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/suit_cycler/attack_paw(mob/user as mob) - user << "\blue The console controls are far too complicated for your tiny brain!" - return - /obj/machinery/suit_cycler/attackby(obj/item/I as obj, mob/user as mob, params) if(electrified != 0) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 7b69d8fdee2..c472711e159 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -394,9 +394,6 @@ /obj/machinery/vending/attack_ai(mob/user as mob) return attack_hand(user) -/obj/machinery/vending/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/machinery/vending/attack_hand(mob/user as mob) if(stat & (BROKEN|NOPOWER)) return diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 356936dbe81..a4832793c7e 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -524,9 +524,6 @@ src.log_append_to_last("Armor saved.") return -/obj/mecha/attack_paw(mob/living/user as mob) - return src.attack_hand(user) - /obj/mecha/attack_alien(mob/living/user as mob) src.log_message("Attack by alien. Attacker - [user].",1) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index c4965210c95..f88992671ca 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -12,9 +12,6 @@ attack_ai(var/mob/user as mob) return src.attack_hand(user) - attack_paw(var/mob/user as mob) - return src.attack_hand(user) - attack_hand(var/mob/user as mob) if(..()) return diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 82886f9f7c5..cac20a32362 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -119,10 +119,6 @@ healthcheck() -/obj/structure/alien/resin/attack_paw(mob/user) - return attack_hand(user) - - /obj/structure/alien/resin/attack_alien(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) @@ -314,7 +310,7 @@ Grow() -/obj/structure/alien/egg/attack_paw(mob/user) +/obj/structure/alien/egg/attack_alien(mob/user) if(isalien(user)) switch(status) if(BURST) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index b73c5bf8f1f..cf41bb42fd0 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -1105,10 +1105,6 @@ steam.start() -- spawns the effect if(metal==1 || prob(50)) del(src) - attack_paw(var/mob/user) - attack_hand(user) - return - attack_hand(var/mob/user) if ((HULK in user.mutations) || (prob(75 - metal*25))) user << "\blue You smash through the metal foam wall." diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 91eb8b450bf..2121cae8c43 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -165,7 +165,7 @@ return 1 -/obj/item/attack_paw(mob/user as mob) +/obj/item/attack_alien(mob/user as mob) if(isalien(user)) // -- TLE var/mob/living/carbon/alien/A = user diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index a76d8c1cdeb..48adb04c988 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -40,9 +40,6 @@ spawn (0) attack_self(user) -/obj/item/device/radio/intercom/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/item/device/radio/intercom/attack_hand(mob/user as mob) add_fingerprint(user) spawn (0) diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm index b9d21b36934..95430e24238 100644 --- a/code/game/objects/items/policetape.dm +++ b/code/game/objects/items/policetape.dm @@ -172,9 +172,6 @@ var/list/tape_roll_applications = list() else breaktape(/obj/item/weapon/soap, user)//cant be null, and can't be sharp. -/obj/item/tape/attack_paw(mob/user as mob) - breaktape(/obj/item/weapon/wirecutters,user) - /obj/item/tape/attack_alien(mob/user as mob) breaktape(/obj/item/weapon/wirecutters,user) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 659cc938e2f..e0946240530 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -26,9 +26,6 @@ buf.dna.ResetSE() SetValue(value) -/obj/item/weapon/dnainjector/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/item/weapon/dnainjector/proc/GetRealBlock(var/selblock) if(selblock==0) return block diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index fb9bc8d0ab6..b475e99ad3e 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -102,6 +102,3 @@ /obj/item/weapon/grenade/attack_hand() walk(src, null, null) ..() - -/obj/item/weapon/grenade/attack_paw(mob/user as mob) - return attack_hand(user) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 3b37a08299c..1c4936112a2 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -193,10 +193,6 @@ LINEN BINS -/obj/structure/bedsheetbin/attack_paw(mob/user as mob) - return attack_hand(user) - - /obj/structure/bedsheetbin/attack_hand(mob/user as mob) if(amount >= 1) amount-- diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8e4be5bd8f7..ce4729c3a03 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -328,10 +328,6 @@ spawn(30) lastbang = 0 - -/obj/structure/closet/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/structure/closet/attack_hand(mob/user as mob) src.add_fingerprint(user) src.toggle(user) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 14807277647..ca6c64318f2 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -183,10 +183,6 @@ usr << "\blue The [src.name] is closed." update_icon() - attack_paw(mob/user as mob) - attack_hand(user) - return - attack_ai(mob/user as mob) if(src.smashed) user << "\red The security of the cabinet is compromised." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 9dd81f658ec..c237650d21e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -100,9 +100,6 @@ else src.toggle(user) -/obj/structure/closet/secure_closet/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/structure/closet/secure_closet/verb/verb_togglelock() set src in oview(1) // One square distance set category = "Object" diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index b7f18ced386..f89ed09d6bb 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -72,7 +72,7 @@ desc = "A display case for the captain's antique laser gun. It taunts you to kick it." /obj/structure/displaycase/captains_laser/New() - req_access = list(access_captain) + req_access = list(access_captain) locked = 1 spawn(5) occupant = new /obj/item/weapon/gun/energy/laser/captain(src) @@ -217,8 +217,6 @@ occupant=W update_icon() -/obj/structure/displaycase/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/structure/displaycase/attack_hand(mob/user as mob) if (destroyed) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 74070214bd8..f8b3317253a 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -55,10 +55,6 @@ opened = !opened update_icon() -/obj/structure/extinguisher_cabinet/attack_paw(mob/user) - attack_hand(user) - return - /obj/structure/extinguisher_cabinet/update_icon() if(!opened) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index bb5838ceffd..9e66774f900 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -54,9 +54,6 @@ if(ismob(user)) shock(user, 70) -/obj/structure/grille/attack_paw(mob/living/user as mob) - attack_hand(user) - /obj/structure/grille/attack_hand(mob/living/user as mob) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 5d4eab9c35b..e75625b6a78 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -67,9 +67,6 @@ //world << "glass at [x],[y],[z] Mhit" deflate(1) - attack_paw(mob/user as mob) - return attack_generic(user, 15) - attack_hand(mob/user as mob) add_fingerprint(user) return @@ -184,9 +181,6 @@ if(get_dist(user,src) <= 1) //not remotely though return TryToSwitchState(user) - attack_paw(mob/user as mob) - return TryToSwitchState(user) - attack_hand(mob/user as mob) return TryToSwitchState(user) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index dfcb2f58270..8a431c43ac1 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -66,8 +66,5 @@ add_fingerprint(user) -/obj/structure/ladder/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params) return attack_hand(user) \ No newline at end of file diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 5b6acef00ec..229fe4e9055 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -72,9 +72,6 @@ ..() return -/obj/structure/lamarr/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/structure/lamarr/attack_hand(mob/user as mob) if (src.destroyed) return diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 56e589ea1ae..51b0cfb5ea6 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -44,9 +44,6 @@ if(get_dist(user,src) <= 1) //not remotely though return TryToSwitchState(user) - attack_paw(mob/user as mob) - return TryToSwitchState(user) - attack_hand(mob/user as mob) return TryToSwitchState(user) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index c591c75b0e3..ce743717f32 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -27,13 +27,13 @@ if(src.contents.len) var/mob/living/M = locate() in contents - + var/obj/structure/closet/body_bag/B = locate() in contents if(M==null) M = locate() in B if(M) var/mob/dead/observer/G = M.get_ghost() - + if(M.client) src.icon_state = "morgue3" else if(G && G.client) //There is a ghost and it is connected to the server @@ -73,8 +73,6 @@ /obj/structure/morgue/alter_health() return src.loc -/obj/structure/morgue/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/structure/morgue/attack_hand(mob/user as mob) if (src.connected) @@ -155,8 +153,6 @@ anchored = 1.0 throwpass = 1 -/obj/structure/m_tray/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/structure/m_tray/attack_hand(mob/user as mob) if (src.connected) @@ -240,8 +236,6 @@ /obj/structure/crematorium/alter_health() return src.loc -/obj/structure/crematorium/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/structure/crematorium/attack_hand(mob/user as mob) // if (cremating) AWW MAN! THIS WOULD BE SO MUCH MORE FUN ... TO WATCH @@ -375,9 +369,6 @@ anchored = 1.0 throwpass = 1 -/obj/structure/c_tray/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/structure/c_tray/attack_hand(mob/user as mob) if (src.connected) for(var/atom/movable/A as mob|obj in src.loc) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 5d6dac37720..b19876e2e8e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -30,9 +30,6 @@ ..() return -/obj/structure/stool/bed/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/structure/stool/bed/attack_hand(mob/user as mob) manual_unbuckle(user) return diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 523aa5a8e7a..520f951bca3 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -294,13 +294,6 @@ if(prob(75)) destroy() -/obj/structure/table/attack_paw(mob/living/user) - if(HULK in user.mutations) - user.do_attack_animation(src) - user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - visible_message("[user] smashes the [src] apart!") - destroy() - /obj/structure/table/attack_alien(mob/living/user) user.do_attack_animation(src) @@ -923,13 +916,6 @@ destroy() -/obj/structure/rack/attack_paw(mob/living/user) - if(HULK in user.mutations) - user.do_attack_animation(src) - user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - visible_message("[user] smashes [src] apart!") - destroy() - /obj/structure/rack/attack_alien(mob/living/user) user.do_attack_animation(src) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 0ff0b69658e..603792c68c7 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -148,9 +148,6 @@ var/global/wcColored return -/obj/structure/window/attack_paw(mob/user as mob) - return attack_hand(user) - /obj/structure/window/proc/attack_generic(mob/living/user as mob, damage = 0) //used by attack_alien, attack_animal, and attack_slime user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 307696a3a26..c7441526ab9 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -194,10 +194,6 @@ var/list/wood_icons = list("wood","wood-broken") else return 0 - -/turf/simulated/floor/attack_paw(mob/user as mob) - return src.attack_hand(user) - /turf/simulated/floor/attack_hand(mob/user as mob) if (is_light_floor()) var/obj/item/stack/tile/light/T = floor_tile diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 275a247d945..482979bc0e2 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -252,22 +252,6 @@ //Interactions -/turf/simulated/wall/attack_paw(mob/living/user as mob) - user.changeNext_move(CLICK_CD_MELEE) - if ((HULK in user.mutations)) - user.do_attack_animation(src) - if (prob(40)) - usr << text("\blue You smash through the wall.") - usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - dismantle_wall(1) - return - else - usr << text("\blue You punch the wall.") - take_damage(rand(25, 75)) - return - - return src.attack_hand(user) - /turf/simulated/wall/attack_animal(var/mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index de8201d1595..9d021fa6da2 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -27,9 +27,6 @@ else set_light(0) -/turf/space/attack_paw(mob/user as mob) - return src.attack_hand(user) - /turf/space/attack_hand(mob/user as mob) if ((user.restrained() || !( user.pulling ))) return @@ -343,4 +340,4 @@ proc/setup_map_transitions() //listamania else S.transition = directions[Z_NORTH] - S.Assign_Destination() + S.Assign_Destination() diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm index 74cd160a86b..cd36c4a1bb5 100644 --- a/code/game/turfs/unsimulated/floor.dm +++ b/code/game/turfs/unsimulated/floor.dm @@ -3,9 +3,6 @@ icon = 'icons/turf/floors.dmi' icon_state = "Floor3" -/turf/unsimulated/floor/attack_paw(user as mob) - return src.attack_hand(user) - /turf/unsimulated/floor/attack_hand(var/mob/user as mob) if ((!( user.canmove ) || user.restrained() || !( user.pulling ))) return diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm index 14bc5b8e413..c66c6504ad4 100644 --- a/code/game/vehicles/spacepods/spacepod.dm +++ b/code/game/vehicles/spacepods/spacepod.dm @@ -276,8 +276,6 @@ else user << "\blue \The [src] is fully repaired!" -/obj/spacepod/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/spacepod/attack_hand(mob/user as mob) if(!hatch_open) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index cd3e75e4ce5..72fcc6d4f53 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -16,15 +16,6 @@ icon_state = "gag" w_class = 1 -//Monkeys can not take the muzzle off of themself! Call PETA! -/obj/item/clothing/mask/muzzle/attack_paw(mob/user as mob) - if (src == user.wear_mask) - return - else - ..() - return - - /obj/item/clothing/mask/surgical name = "sterile mask" desc = "A sterile mask designed to help prevent the spread of diseases." diff --git a/code/modules/food/candy_maker.dm b/code/modules/food/candy_maker.dm index 7e12fc327bf..b9afb48ad77 100644 --- a/code/modules/food/candy_maker.dm +++ b/code/modules/food/candy_maker.dm @@ -183,9 +183,6 @@ return 1 src.updateUsrDialog() -/obj/machinery/candy_maker/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/candy_maker/attack_ai(mob/user as mob) return 0 diff --git a/code/modules/food/grill_new.dm b/code/modules/food/grill_new.dm index ee8bd4bf460..43914a63967 100644 --- a/code/modules/food/grill_new.dm +++ b/code/modules/food/grill_new.dm @@ -186,9 +186,6 @@ return 1 src.updateUsrDialog() -/obj/machinery/grill/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/grill/attack_ai(mob/user as mob) return 0 diff --git a/code/modules/food/icecream_vat.dm b/code/modules/food/icecream_vat.dm index 19101f5b8e1..e71afb26482 100644 --- a/code/modules/food/icecream_vat.dm +++ b/code/modules/food/icecream_vat.dm @@ -180,9 +180,6 @@ /obj/machinery/icemachine/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/icemachine/attack_paw(mob/user) - return attack_hand(user) - /obj/machinery/icemachine/proc/show_toppings() var/dat = "" diff --git a/code/modules/food/oven_new.dm b/code/modules/food/oven_new.dm index 7d6022ae9ae..136b26a5bd0 100644 --- a/code/modules/food/oven_new.dm +++ b/code/modules/food/oven_new.dm @@ -186,9 +186,6 @@ return 1 src.updateUsrDialog() -/obj/machinery/oven/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/oven/attack_ai(mob/user as mob) return 0 diff --git a/code/modules/mob/living/carbon/alien/alien_defenses.dm b/code/modules/mob/living/carbon/alien/alien_defenses.dm index 16b7a17721c..6c670bc7fe5 100644 --- a/code/modules/mob/living/carbon/alien/alien_defenses.dm +++ b/code/modules/mob/living/carbon/alien/alien_defenses.dm @@ -62,13 +62,6 @@ In all, this is a lot like the monkey code. /N return 0 -/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M as mob) - if(..()) - if (stat != DEAD) - adjustBruteLoss(rand(1, 3)) - updatehealth() - return - /mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M as mob) if(..()) diff --git a/code/modules/mob/living/carbon/human/human_attackpaw.dm b/code/modules/mob/living/carbon/human/human_attackpaw.dm deleted file mode 100644 index 5df58e09631..00000000000 --- a/code/modules/mob/living/carbon/human/human_attackpaw.dm +++ /dev/null @@ -1,18 +0,0 @@ -/mob/living/carbon/human/attack_paw(mob/living/M as mob) - ..() - if (M.a_intent == "help") - help_shake_act(M) - else - M.do_attack_animation(src) - if (M.is_muzzled()) - return - - visible_message("[M.name] bites [src]!", \ - "[M.name] bites [src]!") - playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) - - var/damage = rand(1, 3) - var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") - var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone)) - apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee")) - return diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 801dce4c2ef..97a9375c1f8 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -14,10 +14,6 @@ /obj/machinery/computer/drone_control/attack_ai(var/mob/user as mob) return src.attack_hand(user) -/obj/machinery/computer/drone_control/attack_paw(var/mob/user as mob) - - return src.attack_hand(user) - return /obj/machinery/computer/drone_control/attack_hand(var/mob/user as mob) if(..()) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 9fcea92d006..6c163c41aa3 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1012,10 +1012,6 @@ var/list/robot_verbs_default = list( user.visible_message("[user] pets [src]!", \ "You pet [src]!") -/mob/living/silicon/robot/attack_paw(mob/user) - - return attack_hand(user) - /mob/living/silicon/robot/proc/allowed(mob/M) //check if it doesn't require any access at all if(check_access(null)) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 34d7c63dbd3..827e35a428c 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -732,22 +732,4 @@ /mob/living/simple_animal/parrot/proc/parrot_hear(var/message="") if(!message || stat) return - speech_buffer.Add(message) - -/mob/living/simple_animal/parrot/attack_paw(var/mob/user, var/damage, var/attack_message) - - var/success = ..() - - if(client) - return success - - if(parrot_state == PARROT_PERCH) - parrot_sleep_dur = parrot_sleep_max //Reset it's sleep timer if it was perched - - if(!success) - return 0 - - parrot_interest = user - parrot_state = PARROT_SWOOP | PARROT_ATTACK //Attack other animals regardless - icon_state = "parrot_fly" - return success + speech_buffer.Add(message) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm index 52ac279ccce..2b6fab41b8e 100644 --- a/code/modules/mob/living/simple_animal/tribbles.dm +++ b/code/modules/mob/living/simple_animal/tribbles.dm @@ -197,8 +197,6 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, ..() return -/obj/structure/tribble_cage/attack_paw(mob/user as mob) - return src.attack_hand(user) /obj/structure/tribble_cage/attack_hand(mob/user as mob) if (src.destroyed) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 67d1eacab72..6c567772b99 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -47,10 +47,6 @@ add_fingerprint(M) -/obj/item/weapon/paper_bin/attack_paw(mob/user as mob) - return attack_hand(user) - - /obj/item/weapon/paper_bin/attack_hand(mob/user as mob) if (ishuman(user)) var/mob/living/carbon/human/H = user diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index eaa8bbd1246..e86b0ec9756 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -77,9 +77,6 @@ icon_state = "stamp-cent" _color = "internalaffairs" -/obj/item/weapon/stamp/attack_paw(mob/user as mob) - return attack_hand(user) - // Syndicate stamp to forge documents. /obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob) diff --git a/code/modules/power/engine.dm b/code/modules/power/engine.dm index c07e10ce150..50473d3e445 100644 --- a/code/modules/power/engine.dm +++ b/code/modules/power/engine.dm @@ -1,5 +1,3 @@ -/turf/simulated/floor/engine/attack_paw(var/mob/user as mob) - return src.attack_hand(user) /turf/simulated/floor/engine/attack_hand(var/mob/user as mob) if ((!( user.canmove ) || user.restrained() || !( user.pulling ))) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index b85e5a7c4c0..f23db641632 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -250,9 +250,6 @@ /obj/machinery/chem_dispenser/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/chem_dispenser/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/chem_dispenser/attack_hand(mob/user as mob) if(stat & BROKEN) return @@ -636,9 +633,6 @@ /obj/machinery/chem_master/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/chem_master/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/chem_master/attack_hand(mob/user as mob) if(stat & BROKEN) return @@ -1114,9 +1108,6 @@ src.updateUsrDialog() return 0 -/obj/machinery/reagentgrinder/attack_paw(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/reagentgrinder/attack_ai(mob/user as mob) return 0 diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index c3020926188..1425d769073 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -602,13 +602,11 @@ datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volu H.adjustToxLoss(50) ..() return - if(issmall(M)) - var/mob/living/carbon/monkey/MO = M - if(MO.dna) - if(istype(MO,/mob/living/carbon/alien/diona)) //plantmen monkeys (diona) take EVEN MORE damage - MO.adjustToxLoss(100) - ..() - return + else if(istype(M,/mob/living/carbon/alien/diona)) //plantmen monkeys (diona) take EVEN MORE damage + var/mob/living/carbon/alien/diona/D = M + D.adjustToxLoss(100) + ..() + return /datum/chemical_reaction/atrazine name = "atrazine" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index e5a49cc9680..e24378fb137 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -16,10 +16,6 @@ slot_flags = SLOT_BELT var/ignore_flags = 0 -/obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob) - return src.attack_hand(user) - - /obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user) if(!reagents.total_volume) user << "\red [src] is empty." diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 178662d4fb8..b2cf9c268ed 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -25,10 +25,6 @@ user << "The station AI is not to interact with these devices." return -/obj/machinery/keycard_auth/attack_paw(mob/user as mob) - user << "You are too primitive to use this device." - return - /obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(stat & (NOPOWER|BROKEN)) user << "This device is not powered." @@ -57,7 +53,7 @@ /obj/machinery/keycard_auth/attack_hand(mob/user as mob) ui_interact(user) - + /obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(user.stat || stat & (NOPOWER|BROKEN)) user << "This device is not powered." @@ -67,7 +63,7 @@ return user.set_machine(src) - + var/data[0] data["screen"] = screen data["event"] = event @@ -77,12 +73,12 @@ if((type in ert_chosen)) active = 1 data["erttypes"] += list(list("name" = type, "active" = active)) - - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) + + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "keycard_auth.tmpl", "Keycard Authentication Device UI", 520, 320) - ui.set_initial_data(data) - ui.open() + ui.set_initial_data(data) + ui.open() /obj/machinery/keycard_auth/Topic(href, href_list) if(..()) @@ -184,7 +180,7 @@ var/global/maint_all_access = 0 world << "Attention!" world << "The maintenance access requirement has been revoked on all airlocks." maint_all_access = 1 - + /proc/revoke_maint_all_access() for(var/area/maintenance/A in world) for(var/obj/machinery/door/airlock/D in A) diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 192449d7735..89b30243c3f 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -69,9 +69,6 @@ else ..() -/obj/machinery/shield_capacitor/attack_paw(user as mob) - return src.attack_hand(user) - /obj/machinery/shield_capacitor/attack_ai(user as mob) return src.attack_hand(user) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 97375aa9c26..030f852d08a 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -77,9 +77,6 @@ else ..() -/obj/machinery/shield_gen/attack_paw(user as mob) - return src.attack_hand(user) - /obj/machinery/shield_gen/attack_ai(user as mob) return src.attack_hand(user) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 6d53a63aa10..b4bff7b37f2 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -50,10 +50,6 @@ for(var/i = 1; i <= starting_crystals; i++) crystals += new /obj/item/bluespace_crystal/artificial(null) // starting crystals -/obj/machinery/computer/telescience/attack_paw(mob/user) - user << "You are too primitive to use this computer." - return - /obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/bluespace_crystal)) if(crystals.len >= max_crystals) @@ -80,7 +76,7 @@ updateUsrDialog() else ..() - + /obj/machinery/computer/telescience/emag_act(user as mob) if (!emagged) user << "\blue You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!" diff --git a/code/modules/virus2/curer.dm b/code/modules/virus2/curer.dm index df27fdfb841..054f56c8cd4 100644 --- a/code/modules/virus2/curer.dm +++ b/code/modules/virus2/curer.dm @@ -37,11 +37,6 @@ /obj/machinery/computer/curer/attack_ai(var/mob/user as mob) return src.attack_hand(user) -/obj/machinery/computer/curer/attack_paw(var/mob/user as mob) - - return src.attack_hand(user) - return - /obj/machinery/computer/curer/attack_hand(var/mob/user as mob) if(..()) return diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index d1938d6cdb1..5a407e37908 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -36,9 +36,6 @@ /obj/machinery/computer/diseasesplicer/attack_ai(var/mob/user as mob) return src.attack_hand(user) -/obj/machinery/computer/diseasesplicer/attack_paw(var/mob/user as mob) - return src.attack_hand(user) - /obj/machinery/computer/diseasesplicer/attack_hand(var/mob/user as mob) if(..()) return ui_interact(user) diff --git a/paradise.dme b/paradise.dme index 4ec576d4155..9ff202b6e76 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1307,7 +1307,6 @@ #include "code\modules\mob\living\carbon\human\human.dm" #include "code\modules\mob\living\carbon\human\human_attackalien.dm" #include "code\modules\mob\living\carbon\human\human_attackhand.dm" -#include "code\modules\mob\living\carbon\human\human_attackpaw.dm" #include "code\modules\mob\living\carbon\human\human_damage.dm" #include "code\modules\mob\living\carbon\human\human_defense.dm" #include "code\modules\mob\living\carbon\human\human_defines.dm"