mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 21:27:01 +01:00
[MIRROR] Various fixes & tweaks (#10582)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Cameron Lennox
Kashargul
parent
1deeebf8d5
commit
253b577e46
@@ -52,9 +52,11 @@
|
||||
|
||||
/obj/item/deadringer/process()
|
||||
if(activated)
|
||||
if (ismob(src.loc))
|
||||
if(ishuman(src.loc))
|
||||
var/mob/living/carbon/human/H = src.loc
|
||||
watchowner = H
|
||||
if(isbelly(watchowner.loc)) //No spawning people in bellies.
|
||||
return
|
||||
if(H.getBruteLoss() > bruteloss_prev || H.getFireLoss() > fireloss_prev)
|
||||
deathprevent()
|
||||
activated = 0
|
||||
@@ -81,7 +83,7 @@
|
||||
if(!D.has_AI())
|
||||
continue
|
||||
D.ai_holder.lose_target()
|
||||
watchowner.alpha = 15
|
||||
watchowner.alpha = 7 //10 is too visible, 5 is too in-visible... 7 is difficult to see but manageable.
|
||||
makeacorpse(watchowner)
|
||||
return
|
||||
|
||||
@@ -96,8 +98,6 @@
|
||||
return
|
||||
corpse = new /mob/living/carbon/human(H.loc)
|
||||
qdel_swap(corpse.dna,H.dna.Clone())
|
||||
corpse.emote("deathgasp")
|
||||
corpse.death(1) //Kills the new mob
|
||||
var/obj/item/clothing/temp = null
|
||||
if(H.get_equipped_item(slot_w_uniform))
|
||||
corpse.equip_to_slot_or_del(new /obj/item/clothing/under/chameleon/changeling(corpse), slot_w_uniform)
|
||||
@@ -162,6 +162,8 @@
|
||||
corpse.flavor_texts = H.flavor_texts.Copy()
|
||||
corpse.real_name = H.real_name
|
||||
corpse.name = H.name
|
||||
corpse.emote("deathgasp") //Done after the name is set.
|
||||
corpse.death(1) //Kills the new mob
|
||||
corpse.set_species(corpse.dna.species)
|
||||
corpse.change_hair(H.h_style)
|
||||
corpse.change_facial_hair(H.f_style)
|
||||
|
||||
@@ -315,8 +315,7 @@ var/list/preferences_datums = list()
|
||||
else if(href_list["close"])
|
||||
// User closed preferences window, cleanup anything we need to.
|
||||
clear_character_previews()
|
||||
if(GLOB.mannequins[client_ckey])
|
||||
qdel_null(GLOB.mannequins[client_ckey])
|
||||
//Mannequin removal code needed here...For the far future once harddels are solved.
|
||||
return 1
|
||||
else
|
||||
return 0
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
name = "bluespace monkey deployment system"
|
||||
desc = "An Advanced monkey teleportation and rehydration system. For serious monkey business."
|
||||
id = "monkey_gun"
|
||||
req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4, TECH_BLUESPACE = 6)
|
||||
materials = list(MAT_PLASTEEL = 5000, MAT_GLASS = 5000, MAT_DIAMOND = 500, MAT_MORPHIUM = 350)
|
||||
req_tech = list(TECH_BIO = 6, TECH_BLUESPACE = 5)
|
||||
materials = list(MAT_STEEL = 3500, MAT_GLASS = 3500, MAT_PHORON = 1500, MAT_DIAMOND = 1500)
|
||||
build_path = /obj/item/xenobio/monkey_gun
|
||||
sort_string = "HBBA"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user