cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

teshari shaped things can also always be picked up now

Browse Source
This commit is contained in:
Seris02
2023-01-23 20:10:31 +08:00
parent c9cc75a83d
commit 3e6631a084
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm
+3 -3
View File
@@ -9,8 +9,8 @@
var/mob/living/carbon/human/DraggedH = src
//make sure src (the dragged) is a teshari
if(DraggedH.species.name == SPECIES_TESHARI)
//make sure src (the dragged) is a teshari (or shaped like one)
if(DraggedH.species.get_bodytype() == SPECIES_TESHARI)
var/mob/living/M = over_object
// only perform the grab if; grabber and grabbed adjacent, caller is grabbed OR grabber, and the grabbed's grab preference is true.
if(holder_type && istype(M) && Adjacent(M) && (usr == M || usr == DraggedH) && DraggedH != M && !M.incapacitated() && DraggedH.pickup_pref && (M != usr || (M == usr && M.pickup_active)) && (DraggedH.a_intent == I_HELP && M.a_intent == I_HELP)) //VOREStation Edit
@@ -23,7 +23,7 @@
/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
var/mob/living/carbon/human/H = A
if(istype(H))
if(H.species.name == SPECIES_TESHARI)
if(H.species.get_bodytype() == SPECIES_TESHARI)
return 1
return ..()