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

[MIRROR] Pest mob has_trait (#12499)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-03-09 00:49:35 +01:00
committed by GitHub
co-authored by Will Kashargul
parent fbe6038e58
commit de2184e6cc
24 changed files with 58 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/vacpack.dm
+3 -3
View File
@@ -154,7 +154,7 @@
if(L.size_multiplier < 0.5 || vac_power >= 6)
suckables += L
continue
if(istype(L,/mob/living/simple_mob/animal/passive/mouse) || istype(L,/mob/living/simple_mob/animal/passive/lizard) || istype(L,/mob/living/simple_mob/animal/passive/cockroach))
if(HAS_TRAIT(L, TRAIT_AMBIENT_PEST_MOB))
suckables += L
if(LAZYLEN(suckables))
if(vac_power == 7)
@@ -166,7 +166,7 @@
auto_setting = min(I.w_class, 5)
if(isliving(F))
var/mob/living/L = F
if(L.size_multiplier < 0.5 || istype(L,/mob/living/simple_mob/animal/passive/mouse) || istype(L,/mob/living/simple_mob/animal/passive/lizard) || istype(L,/mob/living/simple_mob/animal/passive/cockroach))
if(L.size_multiplier < 0.5 || HAS_TRAIT(L, TRAIT_AMBIENT_PEST_MOB))
if(auto_setting < 3)
auto_setting = 3
else
@@ -246,7 +246,7 @@
if(L.anchored || !L.devourable || L == user || L.buckled || !L.can_be_drop_prey)
return
if(vac_power >= 3)
if(L.size_multiplier > 0.5 || istype(L,/mob/living/simple_mob/animal/passive/mouse) || istype(L,/mob/living/simple_mob/animal/passive/lizard))
if(L.size_multiplier > 0.5 || HAS_TRAIT(L, TRAIT_AMBIENT_PEST_MOB))
valid_to_suck = TRUE
auto_setting = 3
if(vac_power >= 6)
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
@@ -355,7 +355,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