cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken tesh mechanics + nerf underwater diving

Browse Source
This commit is contained in:
Raeschen
2022-11-13 17:46:19 +01:00
parent fdc1fff93b
commit b34b2ce48f
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm
View File

@@ -1,2 +1,29 @@
/datum/species/teshari
vore_belly_default_variant = "T"
vore_belly_default_variant = "T"
// allow teshari to always be scooped, as long as pref is enabled
/mob/living/MouseDrop(var/atom/over_object)
// make sure src (The dragged) is human
if(!istype(src, /mob/living/carbon/human))
return ..()
var/mob/living/carbon/human/DraggedH = src
//make sure src (the dragged) is a teshari
if(DraggedH.species.name == 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
get_scooped(M, (usr == DraggedH))
return
return ..()
//allow teshari permission to pass plastic flaps.
/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
var/mob/living/carbon/human/H = A
if(istype(H))
if(H.species.name == SPECIES_TESHARI)
return 1
return ..()