cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pest mob has_trait (#19262)

Browse Source 
* trait

* ignore this for now...

* text

* many mouse checks are just pest checks

* remove more manually done pronoun code

* Revert "remove more manually done pronoun code"

This reverts commit 3a6401f443.

* user should be passed

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Will
2026-03-08 19:31:33 -04:00
committed by GitHub
parent f9da8eb1e2
commit 9fff3bb4f4
24 changed files with 58 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/railing.dm
+3 -3
View File
@@ -133,8 +133,8 @@
if (WEST)
add_overlay(image(icon, src, "[icon_modifier]mcorneroverlay", pixel_y = 32))
/obj/structure/railing/handle_rotation_verbs(angle)
if(!can_touch(usr))
/obj/structure/railing/handle_rotation_verbs(angle, mob/user)
if(!can_touch(user))
return FALSE
. = ..()
if(.)
@@ -148,7 +148,7 @@
if(usr.incapacitated())
return 0
if (!can_touch(usr) || ismouse(usr))
if (!can_touch(usr) || HAS_TRAIT(usr, TRAIT_AMBIENT_PEST_MOB))
return
if(anchored)
code/game/objects/structures/windoor_assembly.dm
+1 -1
View File
@@ -271,7 +271,7 @@
name = "near finished "
name += "[secure ? "secure " : ""]windoor assembly[created_name ? " ([created_name])" : ""]"
/obj/structure/windoor_assembly/handle_rotation_verbs(angle)
/obj/structure/windoor_assembly/handle_rotation_verbs(angle, mob/user)
if(state != "01")
update_nearby_tiles(need_rebuild=1) //Compel updates before
. = ..()
code/game/objects/structures/window.dm
+1 -1
View File
@@ -349,7 +349,7 @@
take_damage(damage)
return
/obj/structure/window/handle_rotation_verbs(angle)
/obj/structure/window/handle_rotation_verbs(angle, mob/user)
if(is_fulltile())
return FALSE
update_nearby_tiles(need_rebuild=1) //Compel updates before