cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

3/3 port done

Browse Source
This commit is contained in:
ZomgPonies
2015-05-25 20:16:34 -04:00
parent 1935a82afe
commit e056abfb82
100 changed files with 57 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/masks/miscellaneous.dm
-9
View File
@@ -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."
code/modules/food/candy_maker.dm
-3
View File
@@ -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
code/modules/food/grill_new.dm
-3
View File
@@ -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
code/modules/food/icecream_vat.dm
-3
View File
@@ -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 = ""
code/modules/food/oven_new.dm
-3
View File
@@ -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
code/modules/mob/living/carbon/alien/alien_defenses.dm
-7
View File
@@ -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(..())
code/modules/mob/living/carbon/human/human_attackpaw.dm
-18
View File
@@ -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("<span class='danger'>[M.name] bites [src]!</span>", \
"<span class='userdanger'>[M.name] bites [src]!</span>")
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
code/modules/mob/living/silicon/robot/drone/drone_console.dm
-4
View File
@@ -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(..())
code/modules/mob/living/silicon/robot/robot.dm
-4
View File
@@ -1012,10 +1012,6 @@ var/list/robot_verbs_default = list(
user.visible_message("<span class='notice'>[user] pets [src]!</span>", \
"<span class='notice'>You pet [src]!</span>")
/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))
code/modules/mob/living/simple_animal/parrot.dm
+1 -19
View File
@@ -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)
code/modules/mob/living/simple_animal/tribbles.dm
-2
View File
@@ -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)
code/modules/paperwork/paperbin.dm
-4
View File
@@ -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
code/modules/paperwork/stamps.dm
-3
View File
@@ -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)
code/modules/power/engine.dm
-2
View File
@@ -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 )))
code/modules/reagents/Chemistry-Machinery.dm
-9
View File
@@ -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
code/modules/reagents/newchem/toxins.dm
+5 -7
View File
@@ -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"
code/modules/reagents/reagent_containers/hypospray.dm
-4
View File
@@ -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."
code/modules/security levels/keycard authentication.dm
+7 -11
View File
@@ -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 << "<font size=4 color='red'>Attention!</font>"
world << "<font color='red'>The maintenance access requirement has been revoked on all airlocks.</font>"
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)
code/modules/shieldgen/shield_capacitor.dm
-3
View File
@@ -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)
code/modules/shieldgen/shield_gen.dm
-3
View File
@@ -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)
code/modules/telesci/telesci_computer.dm
+1 -5
View File
@@ -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!"
code/modules/virus2/curer.dm
-5
View File
@@ -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
code/modules/virus2/diseasesplicer.dm
-3
View File
@@ -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)