diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index e392d3ee432..1dfcd96835a 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -8,7 +8,7 @@ return /obj/attackby(obj/item/I, mob/living/user, params) - return I.attack_obj(src, user) //phil235 + return I.attack_obj(src, user) /mob/living/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) @@ -20,12 +20,11 @@ if(do_mob(user, src, 80/sharpness)) harvest(user) return 1 - return I.attack(src, user) //phil235 should we return 1 if successful special attack() so we don't call afterattack? - //see the attack() procs if it'd be useful. + return I.attack(src, user) /obj/item/proc/attack(mob/living/M, mob/living/user, def_zone) - if(flags & (NOBLUDGEON|ABSTRACT)) //phil235 check that no abstract item uses attack or attack_obj + if(flags & (NOBLUDGEON|ABSTRACT)) return if(!force) playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1) @@ -43,7 +42,7 @@ //the equivalent of the standard version of attack() but for object targets. /obj/item/proc/attack_obj(obj/O, mob/living/user) - if(flags & (NOBLUDGEON|ABSTRACT)) //phil235 + if(flags & (NOBLUDGEON|ABSTRACT)) return user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(O) @@ -68,6 +67,8 @@ var/turf/location = get_turf(src) location.add_blood_floor(src) + + // Proximity_flag is 1 if this afterattack was called on something adjacent, in your square, or on your person. // Click parameters is the params string from byond Click() code, see that documentation. /obj/item/proc/afterattack(atom/target, mob/user, proximity_flag, click_parameters) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index aeebec18d4d..09e955a44d3 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -23,7 +23,7 @@ var/safe = 1 //whether the door detects things and mobs in its way and reopen or crushes them. var/locked = 0 //whether the door is bolted or not. - var/auto_close //phil235 to be removed, it's preventing a runtime with map. + var/auto_close //TO BE REMOVED, no longer used, it's just preventing a runtime with a map var edit. /obj/machinery/door/New() ..() diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 12e87f98ee9..32111cab817 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -262,10 +262,6 @@ Class Procs: if(sound_effect) playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) -//phil235 - - - /obj/machinery/attack_alien(mob/living/carbon/alien/humanoid/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) @@ -277,7 +273,7 @@ Class Procs: /obj/machinery/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) - if(M.melee_damage_upper > 0) // phil235 use M.attack_text verb? + if(M.melee_damage_upper > 0) M.visible_message("[M.name] smashes against \the [src.name].",\ "You smash against the [src.name].") take_damage(M.melee_damage_upper, M.melee_damage_type, 1) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 4005154672f..462dee8ff9d 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -191,7 +191,7 @@ var/list/obj/machinery/newscaster/allCasters = list() var/allow_comments = 1 luminosity = 0 anchored = 1 - var/hitstaken = 0 //phil235 to be removed, it's used in a map var edit. + var/hitstaken = 0 //TO BE REMOVED, no longer used, the var is present in a map var edit which must be removed. /obj/machinery/newscaster/security_unit name = "security newscaster" @@ -782,8 +782,6 @@ var/list/obj/machinery/newscaster/allCasters = list() else take_damage(5) -//phil235 missing attack_alien, attack_animal, bullet_act, etc... - /obj/machinery/newscaster/proc/AttachPhoto(mob/user) if(photo) if(!photo.sillynewscastervar) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index ebd6e3d05c1..ba14a0d3540 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -10,7 +10,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon = 'icons/obj/pda.dmi' icon_state = "pda" item_state = "electronic" - flags = NOBLUDGEON //phil235 test it + flags = NOBLUDGEON w_class = 1 slot_flags = SLOT_ID | SLOT_BELT origin_tech = "programming=2" diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index f1908a99533..2f0a38ff8c7 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -125,7 +125,7 @@ var/global/list/RPD_recipes=list( desc = "A device used to rapidly pipe things." icon = 'icons/obj/items.dmi' icon_state = "rpd" - flags = CONDUCT //phil235 SEMIBLUDGEON? + flags = CONDUCT force = 10 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 38ba595e717..0ec9b84479c 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -61,8 +61,9 @@ RSF return // Change mode -/obj/item/weapon/rsf/afterattack(atom/A, mob/user, proximity) //phil235 shitty proc, rewrite. - if(!proximity) return +/obj/item/weapon/rsf/afterattack(atom/A, mob/user, proximity) + if(!proximity) + return if (!(istype(A, /obj/structure/table) || istype(A, /turf/open/floor))) return diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index b4356035962..475f602428d 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -174,7 +174,7 @@ ..() if(ismob(target)) var/mob/M - if(src.loc == M) //target caught the sword //phil235 NO, shit + if(src.loc == M) M.drop_item() consume_everything(target) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 2b29db5f5b3..6cf002db034 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -154,7 +154,7 @@ /obj/item/weapon/reagent_containers/spray/mister/afterattack(obj/target, mob/user, proximity) if(target.loc == loc) //Safety check so you don't fill your mister with mutagen or something and then blast yourself in the face with it - return //phil235 shitty check + return ..() //Janitor tank diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 49c2c4dd884..022e31bd97e 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -348,7 +348,7 @@ var/turf/location = get_turf(user) location.hotspot_expose(700, 50, 1) - if(isliving(O)) //phil235 need the new bitflag + if(isliving(O)) var/mob/living/L = O L.IgniteMob() diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 173d87b92af..495b9ca5693 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -88,8 +88,6 @@ user.visible_message("[user] rubs some dust off from the [name]'s surface.", \ "You rub some dust off from the [name]'s surface.") -//attack alien animal phil235 - /obj/structure/statue/CanAtmosPass() return !density @@ -208,7 +206,7 @@ /obj/structure/statue/plasma/bullet_act(obj/item/projectile/Proj) var/burn = FALSE - if(istype(Proj,/obj/item/projectile/beam)) //phil235 test this + if(istype(Proj,/obj/item/projectile/beam)) PlasmaBurn(2500) burn = TRUE else if(istype(Proj,/obj/item/projectile/ion)) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index bf8b3a9476f..162efa790e3 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -374,7 +374,7 @@ //merges adjacent full-tile windows into one /obj/structure/window/update_icon() - if(!qdeleted(src)) //phil235 + if(!qdeleted(src)) if(!fulltile) return diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 790cf6e47c1..1eeebc6d0ab 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -37,8 +37,6 @@ if(istype(I.loc,/obj/item/weapon/storage)) //in a container. var/obj/item/weapon/storage/U = I.loc U.remove_from_storage(I, src) -// user.client.screen -= I -//phil235 U.contents.Remove(I) else if(user.l_hand == I) //in a hand user.drop_l_hand() else if(user.r_hand == I) //in a hand