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

Merge pull request #5599 from Seris02/teshshapedrage

Browse Source 
allows teshari shaped things to be picked always picked up along with teshari
This commit is contained in:
Nadyr
2023-01-27 10:33:41 -05:00
committed by GitHub
parent f485350757 3e6631a084
commit 39b5432bbc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/resizing/holder_micro_ch.dm
+3 -3
View File
@@ -5,7 +5,7 @@
/obj/item/weapon/holder/micro/Initialize(mapload, mob/held)
. = ..()
var/mob/living/carbon/human/H = held_mob
if(istype(H) && H.species.name == SPECIES_TESHARI)
if(istype(H) && H.species.get_bodytype() == SPECIES_TESHARI)
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
@@ -22,8 +22,8 @@
/obj/item/weapon/holder/micro/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
var/mob/living/carbon/human/H = held_mob
// Only proceed if dealing with a tesh
if(istype(H) && H.species.name == SPECIES_TESHARI)
// Only proceed if dealing with a tesh (or something shaped like a tesh)
if(istype(H) && H.species.get_bodytype() == SPECIES_TESHARI)
var/colortemp = color //save original color var to a temp var
//convert numerical RGB to Hex #000000 format - is this necessary?
//then 'inject' changed color (from skin color) into original proc call
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 ..()