cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 14:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Player-controlled simplemobs can now open lockers and morgue trays (#23543)

Browse Source 
* Closets

* Morgue

* FIxes

* Whitespace

* AAAAA

* Update code/game/objects/structures/crates_lockers/closets.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Daylight
2023-12-31 12:40:27 +02:00
committed by GitHub
parent 8893663d4b
commit a13e91a29d
2 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -278,6 +278,24 @@
add_fingerprint(user)
toggle(user)
/obj/structure/closet/attack_animal(mob/living/user)
if(user.a_intent == INTENT_HARM || welded || locked)
return ..()
if(!user.mind) // Stops mindless mobs from opening lockers + endlessly opening/closing crates instead of attacking
return ..()
if(user.mob_size < MOB_SIZE_HUMAN)
return ..()
add_fingerprint(user)
toggle(user)
/obj/structure/closet/attack_alien(mob/user)
if(user.a_intent == INTENT_HARM || welded || locked)
return ..()
if(!user.mind)
return ..()
add_fingerprint(user)
toggle(user)
/obj/structure/closet/attack_ghost(mob/user)
if(user.can_advanced_admin_interact())
toggle(user)

32
code/game/objects/structures/morgue.dm
View File

@@ -152,6 +152,22 @@
update_state()
return
/obj/structure/morgue/attack_animal(mob/living/user)
if(user.a_intent == INTENT_HARM)
return ..()
if(user.mob_size < MOB_SIZE_HUMAN)
return ..()
if(!user.mind) //Stops mindless mobs from doing weird stuff with them
return ..()
attack_hand(user)
/obj/structure/morgue/attack_alien(mob/user)
if(user.a_intent == INTENT_HARM)
return ..()
if(!user.mind)
return ..()
attack_hand(user)
/obj/structure/morgue/attackby(P as obj, mob/user as mob, params)
if(is_pen(P))
var/t = rename_interactive(user, P)
@@ -250,6 +266,22 @@
qdel(src)
return
/obj/structure/m_tray/attack_animal(mob/living/user)
if(user.a_intent == INTENT_HARM)
return ..()
if(user.mob_size < MOB_SIZE_HUMAN)
return ..()
if(!user.mind) //Stops mindless mobs from doing weird stuff with them
return ..()
attack_hand(user)
/obj/structure/m_tray/attack_alien(mob/user)
if(user.a_intent == INTENT_HARM)
return ..()
if(!user.mind)
return ..()
attack_hand(user)
/obj/structure/m_tray/MouseDrop_T(atom/movable/O, mob/living/user)
if((!(istype(O, /atom/movable)) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
return