mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-11 07:04:01 +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:
@@ -294,9 +294,8 @@
|
||||
return
|
||||
|
||||
var/mob/living/new_mob = new chosen_beast(get_turf(M))
|
||||
new_mob.faction = M.faction
|
||||
|
||||
new_mob.mob_tf(M)
|
||||
M.tf_into(new_mob)
|
||||
|
||||
if("item_tf")
|
||||
var/mob/living/M = target
|
||||
@@ -317,11 +316,8 @@
|
||||
|
||||
var/obj/item/spawned_obj = new spawning(M.loc)
|
||||
var/obj/item/original_name = spawned_obj.name
|
||||
spawned_obj.inhabit_item(M, original_name, M)
|
||||
var/mob/living/possessed_voice = spawned_obj.possessed_voice
|
||||
spawned_obj.trash_eatable = M.devourable
|
||||
spawned_obj.unacidable = !M.digestable
|
||||
M.forceMove(possessed_voice)
|
||||
|
||||
M.tf_into(spawned_obj, TRUE, original_name)
|
||||
|
||||
if("elder_smite")
|
||||
if(!target.ckey)
|
||||
|
||||
Reference in New Issue
Block a user