mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-09 17:02:56 +00:00
The 515 MegaPR early downport (#7783)
Co-authored-by: Selis <selis@xynolabs.com> Co-authored-by: Selis <sirlionfur@hotmail.de> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: SatinIsle <thesatinisle@gmail.com> Co-authored-by: Heroman <alesha3000@list.ru> Co-authored-by: Casey <a.roaming.shadow@gmail.com> Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
@@ -220,9 +220,7 @@
|
||||
playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1)
|
||||
else //Shoot, it didn't work and now it's mad!!!
|
||||
S.ai_holder.go_wake()
|
||||
S.ai_holder.target = user
|
||||
S.ai_holder.track_target_position()
|
||||
S.ai_holder.set_stance(STANCE_FIGHT)
|
||||
S.ai_holder.give_target(user, urgent = TRUE)
|
||||
user.visible_message("\The [src] bonks into \the [S], angering it!")
|
||||
playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1)
|
||||
to_chat(user, "<span class='notice'>\The [src] clicks unsatisfyingly.</span>")
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
unpetrify(deleting = TRUE)
|
||||
else
|
||||
visible_message("<span class='warning'>The [identifier] loses shape and crumbles into a pile of [material]!</span>")
|
||||
qdel(gargoyle)
|
||||
QDEL_NULL(gargoyle)
|
||||
. = ..()
|
||||
|
||||
/obj/structure/gargoyle/process()
|
||||
@@ -211,7 +211,7 @@
|
||||
alpha = 0
|
||||
gargoyle.visible_message("<span class='warning'>[gargoyle]'s skin rapidly reverts, returning them to normal!</span>", "<span class='warning'>Your skin reverts, freeing your movement once more![hurtmessage]</span>")
|
||||
gargoyle = null
|
||||
if (!deleting)
|
||||
if (deleting)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/gargoyle/return_air()
|
||||
|
||||
@@ -10,5 +10,4 @@
|
||||
|
||||
/mob/living/carbon/Destroy()
|
||||
. = ..()
|
||||
|
||||
QDEL_NULL(cozyloop)
|
||||
|
||||
@@ -104,8 +104,8 @@
|
||||
/mob/living/carbon/human/proc/GetAppearanceFromPrefs(var/flavourtext, var/oocnotes)
|
||||
/* Jank code that effectively creates the client's mob from save, then copies its appearance to our current mob.
|
||||
Intended to be used with shapeshifter species so we don't reset their organs in doing so.*/
|
||||
var/mob/living/carbon/human/dummy/mannequin/Dummy = new
|
||||
if(client.prefs)
|
||||
var/mob/living/carbon/human/dummy/mannequin/Dummy = get_mannequin(client.ckey)
|
||||
client.prefs.copy_to(Dummy)
|
||||
//Important, since some sprites only work for specific species
|
||||
/* Probably not needed anymore since impersonate_bodytype no longer exists
|
||||
@@ -125,7 +125,6 @@
|
||||
flavor_texts = client.prefs.flavor_texts.Copy()
|
||||
if(oocnotes)
|
||||
ooc_notes = client.prefs.metadata
|
||||
qdel(Dummy)
|
||||
|
||||
/* Alternative version of the above proc, incase it turns out cloning our dummy mob's DNA is an awful, terrible bad idea.
|
||||
Would need to fix this proc up to work as smoothly as the above proc, though.
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
// QDEL_NULL(stunnedloop)
|
||||
|
||||
/mob/living/proc/vs_animate(var/belly_to_animate)
|
||||
return
|
||||
return
|
||||
|
||||
/*
|
||||
Maybe later, gotta figure out a way to click yourself when in a locker etc.
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
|
||||
// This is not a status display message, since it's something the character
|
||||
// themselves is meant to see BEFORE putting the money in
|
||||
to_chat(usr, "\icon[cashmoney][bicon(cashmoney)] <span class='warning'>That is not enough money.</span>")
|
||||
to_chat(usr, "[icon2html(cashmoney,user.client)] <span class='warning'>That is not enough money.</span>")
|
||||
return 0
|
||||
|
||||
if(istype(cashmoney, /obj/item/weapon/spacecash))
|
||||
|
||||
Reference in New Issue
Block a user