Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes LAssailant #11354

Merged
merged 2 commits into from
Aug 23, 2024
Merged

Removes LAssailant #11354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
622b4b2
Removes LAssailant
PowerfulBacon Aug 21, 2024
672fdb5
Update misc.dm
PowerfulBacon Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions code/game/objects/items/melee/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,6 @@

add_fingerprint(user)

if(!iscarbon(user))
target.LAssailant = null
else
target.LAssailant = WEAKREF(user)
cooldown_check = world.time + cooldown
else
var/wait_desc = get_wait_description()
Expand Down Expand Up @@ -514,10 +510,6 @@

add_fingerprint(user)

if(!iscarbon(user))
target.LAssailant = null
else
target.LAssailant = WEAKREF(user)
COOLDOWN_START(src, cooldown_check, cooldown)

//Telescopic Baton
Expand Down Expand Up @@ -743,10 +735,6 @@

target.visible_message(desc["visible"], desc["local"])

if(!iscarbon(user))
target.LAssailant = null
else
target.LAssailant = user
cooldown_check = world.time + cooldown
else
var/wait_desc = get_wait_description()
Expand Down Expand Up @@ -1085,9 +1073,4 @@
var/turf/throw_at = get_ranged_target_turf(target, throw_dir, knockbackpower)
target.throw_at(throw_at, throw_range, 3)

if(!iscarbon(user))
target.LAssailant = null
else
target.LAssailant = user

cooldown = world.time + 15
4 changes: 0 additions & 4 deletions code/modules/mob/living/living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,6 @@
M.visible_message("<span class='warning'>[src] grabs [M] [(is_zone_selected(BODY_ZONE_L_ARM) || is_zone_selected(BODY_ZONE_R_ARM))? "by their hands":"passively"]!</span>", \
"<span class='warning'>[src] grabs you [(is_zone_selected(BODY_ZONE_L_ARM) || is_zone_selected(BODY_ZONE_R_ARM))? "by your hands":"passively"]!</span>", null, null, src) //Message sent to area, Message sent to grabbee
to_chat(src, "<span class='notice'>You grab [M] [(is_zone_selected(BODY_ZONE_L_ARM) || is_zone_selected(BODY_ZONE_R_ARM))? "by their hands":"passively"]!</span>") //Message sent to grabber
if(!iscarbon(src))
M.LAssailant = null
else
M.LAssailant = WEAKREF(usr)
if(isliving(M))
var/mob/living/L = M
//Share diseases that are spread by touch
Expand Down
5 changes: 1 addition & 4 deletions code/modules/mob/living/simple_animal/slime/life.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
var/attack_cooldown = 0
var/attack_cooldown_time = 20 //How long, in deciseconds, the cooldown of attacks is


/mob/living/simple_animal/slime/Life()
set invisibility = 0
if(notransform)
Expand Down Expand Up @@ -144,10 +145,6 @@
if(M.stat == DEAD)
if(client)
to_chat(src, "<i>This subject does not have a strong enough life energy anymore...</i>")
else if(!rabid && !attacked)
var/mob/last_to_hurt = M.LAssailant?.resolve()
if(last_to_hurt && last_to_hurt != M && prob(50))
add_friendship(last_to_hurt, 1)
//we go rabid after finishing to feed on a human with a client.
if(M.client && ishuman(M))
rabid = 1
Expand Down
3 changes: 0 additions & 3 deletions code/modules/mob/mob_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@
/// Can this mob enter shuttles
var/move_on_shuttle = 1

///A weakref to the last mob/living/carbon to push/drag/grab this mob (exclusively used by slimes friend recognition)
var/datum/weakref/LAssailant = null

/**
* construct spells and mime spells.
*
Expand Down
1 change: 0 additions & 1 deletion code/modules/recycling/disposal/bin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@
else
target.visible_message("<span class='danger'>[user] has placed [target] in [src].</span>", "<span class='userdanger'>[user] has placed you in [src].</span>")
log_combat(user, target, "stuffed", addition="into [src]")
target.LAssailant = WEAKREF(user)
. = TRUE
update_appearance()

Expand Down
2 changes: 0 additions & 2 deletions code/modules/research/xenobiology/xenobio_camera.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio)
if(X.monkeys >= 1)
var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc, TRUE, owner)
if (!QDELETED(food))
food.LAssailant = WEAKREF(C)
X.monkeys--
X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
to_chat(owner, "[X] now has [X.monkeys] monkeys stored.")
Expand Down Expand Up @@ -462,7 +461,6 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio)
if(X.monkeys >= 1)
var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(T, TRUE, C)
if (!QDELETED(food))
food.LAssailant = WEAKREF(C)
X.monkeys--
X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
to_chat(C, "[X] now has [X.monkeys] monkeys stored.")
Expand Down
Loading