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

Fixes not being able to pick up or drop items in bellies

Browse Source
This commit is contained in:
Heroman
2019-08-21 16:53:14 +10:00
parent e4a1034c03
commit 2238bc2e16
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/_onclick/click.dm
View File

@@ -114,6 +114,19 @@
trigger_aiming(TARGET_CAN_CLICK) trigger_aiming(TARGET_CAN_CLICK)
return 1 return 1
// VOREStation Addition Start: inbelly item interaction
if(isbelly(loc) && (loc == A.loc))
if(W)
var/resolved = W.resolve_attackby(A,src)
if(!resolved && A && W)
W.afterattack(A, src, 1, params) // 1: clicking something Adjacent
else
if(ismob(A)) // No instant mob attacking
setClickCooldown(get_attack_speed())
UnarmedAttack(A, 1)
return
// VOREStation Addition End
if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that
return return

2
code/modules/mob/mob_movement.dm
View File

@@ -84,7 +84,7 @@
/client/verb/drop_item() /client/verb/drop_item()
set hidden = 1 set hidden = 1
if(!isrobot(mob) && mob.stat == CONSCIOUS && isturf(mob.loc)) if(!isrobot(mob) && mob.stat == CONSCIOUS && (isturf(mob.loc) || isbelly(mob.loc))) // VOREStation Edit: dropping in bellies
return mob.drop_item() return mob.drop_item()
return return