mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 11:38:12 +01:00
TF Verb Mergening (#18353)
* Initial commit * waait a second, this isn't chomp * oop, missed those comments * also missed that * typo! * begone src. * fixes typing! * whoops! * can I get rid of this? * fixes some missed tf calls, attempts to fix ooc escape * band-aid fix for OOC escaping item tf * Update mob_tf.dm * Update living_vr.dm * no src * get rid of redundant faction swaps --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
5447c235f9
commit
0660d084b9
@@ -423,9 +423,8 @@
|
||||
if(M.stat == DEAD) //We can let it undo the TF, because the person will be dead, but otherwise things get weird.
|
||||
return
|
||||
var/mob/living/new_mob = spawn_mob(M)
|
||||
new_mob.faction = M.faction
|
||||
|
||||
new_mob.mob_tf(M)
|
||||
M.tf_into(new_mob)
|
||||
|
||||
|
||||
/obj/item/glamour_unstable/proc/spawn_mob(var/mob/living/target)
|
||||
|
||||
@@ -255,9 +255,8 @@
|
||||
if(M.stat == DEAD) //We can let it undo the TF, because the person will be dead, but otherwise things get weird.
|
||||
return
|
||||
var/mob/living/new_mob = spawn_mob(M)
|
||||
new_mob.faction = M.faction
|
||||
|
||||
new_mob.mob_tf(M)
|
||||
M.tf_into(new_mob)
|
||||
|
||||
addtimer(CALLBACK(new_mob, TYPE_PROC_REF(/mob/living, revert_mob_tf)), 30 SECONDS, TIMER_DELETE_ME)
|
||||
|
||||
|
||||
@@ -341,11 +341,7 @@
|
||||
character.forceMove(cryst)
|
||||
cryst.update_icon()
|
||||
else if(itemtf)
|
||||
itemtf.inhabit_item(character, itemtf.name, character)
|
||||
var/mob/living/possessed_voice = itemtf.possessed_voice
|
||||
itemtf.trash_eatable = character.devourable
|
||||
itemtf.unacidable = !character.digestable
|
||||
character.forceMove(possessed_voice)
|
||||
character.tf_into(itemtf, TRUE, itemtf.name)
|
||||
else if(prey)
|
||||
character.copy_from_prefs_vr(1,1) //Yes I know we're reloading these, shut up
|
||||
var/obj/belly/gut_to_enter
|
||||
|
||||
Reference in New Issue
Block a user