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

Merge pull request #5764 from CHOMPStation2/upstream-merge-14521

Browse Source 
[MIRROR] fixes a few things with holder objects
This commit is contained in:
Razgriz
2023-02-20 16:32:06 -07:00
committed by GitHub
parent 7c5c3be86a fb06ac905d
commit 0eff4ace04
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/holder.dm
+9 -5
View File
@@ -86,6 +86,7 @@ var/list/holder_mob_icon_cache = list()
/obj/item/weapon/holder/Exited(atom/movable/thing, atom/OldLoc)
if(thing == held_mob)
held_mob.transform = original_transform
held_mob.update_transform() //VOREStation edit
held_mob.vis_flags = original_vis_flags
held_mob = null
..()
@@ -106,11 +107,14 @@ var/list/holder_mob_icon_cache = list()
/obj/item/weapon/holder/proc/dump_mob()
if(!held_mob)
return
held_mob.transform = original_transform
held_mob.vis_flags = original_vis_flags
held_mob.forceMove(get_turf(src))
held_mob.reset_view(null)
held_mob = null
if (held_mob.loc == src || isnull(held_mob.loc)) //VOREStation edit
held_mob.transform = original_transform
held_mob.update_transform() //VOREStation edit
held_mob.vis_flags = original_vis_flags
held_mob.forceMove(get_turf(src))
held_mob.reset_view(null)
held_mob = null
invisibility = INVISIBILITY_ABSTRACT //VOREStation edit
/obj/item/weapon/holder/throw_at(atom/target, range, speed, thrower)
if(held_mob)
code/modules/vore/resizing/holder_vr.dm
+5
View File
@@ -0,0 +1,5 @@
/obj/item/weapon/holder/dropped(mob/user)
if (held_mob?.loc != src || isturf(loc))
var/held = held_mob
dump_mob()
held_mob = held
vorestation.dme
+1
View File
@@ -4358,6 +4358,7 @@
#include "code\modules\vore\resizing\grav_pull_vr.dm"
#include "code\modules\vore\resizing\holder_micro_ch.dm"
#include "code\modules\vore\resizing\holder_micro_vr.dm"
#include "code\modules\vore\resizing\holder_vr.dm"
#include "code\modules\vore\resizing\resize_vr.dm"
#include "code\modules\vore\resizing\sizegun_slow_vr.dm"
#include "code\modules\vore\resizing\sizegun_vr.dm"