shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/zombie/items.dm
+22 -15
View File
@@ -17,12 +17,12 @@
/obj/item/zombie_hand/equipped(mob/user, slot)
. = ..()
//these are intentionally inverted
var/i = user.get_held_index_of_item(src)
if(!(i % 2))
icon_state = icon_left
else
icon_state = icon_right
switch(slot)
// Yes, these intentionally don't match
if(slot_l_hand)
icon_state = icon_right
if(slot_r_hand)
icon_state = icon_left
/obj/item/zombie_hand/afterattack(atom/target, mob/user, proximity_flag)
. = ..()
@@ -40,7 +40,7 @@
/obj/item/zombie_hand/proc/check_infection(mob/living/carbon/human/target, mob/user)
CHECK_DNA_AND_SPECIES(target)
if(NOZOMBIE in target.dna.species.species_traits)
if(NOZOMBIE in target.dna.species.specflags)
// cannot infect any NOZOMBIE subspecies (such as high functioning
// zombies)
return
@@ -62,28 +62,33 @@
/obj/item/zombie_hand/proc/tear_airlock(obj/machinery/door/airlock/A, mob/user)
removing_airlock = TRUE
user << "<span class='notice'>You start tearing apart the airlock...</span>"
user << "<span class='notice'>You start tearing apart the airlock...\
</span>"
playsound(src.loc, 'sound/machines/airlock_alien_prying.ogg', 100, 1)
A.audible_message("<span class='italics'>You hear a loud metallic grinding sound.</span>")
A.audible_message("<span class='italics'>You hear a loud metallic \
grinding sound.</span>")
addtimer(src, "growl", 20, TIMER_NORMAL, user)
addtimer(src, "growl", 20, unique=FALSE, user)
if(do_after(user, delay=160, needhand=FALSE, target=A, progress=TRUE))
playsound(src.loc, 'sound/hallucinations/far_noise.ogg', 50, 1)
A.audible_message("<span class='danger'>With a screech, [A] is torn apart!</span>")
A.audible_message("<span class='danger'>With a screech, [A] is torn \
apart!</span>")
var/obj/structure/door_assembly/door = new A.assemblytype(get_turf(A))
door.density = 0
door.anchored = 1
door.name = "ravaged [door]"
door.desc = "An airlock that has been torn apart. Looks like it won't be keeping much out now."
door.desc = "An airlock that has been torn apart. Looks like it \
won't be keeping much out now."
qdel(A)
removing_airlock = FALSE
/obj/item/zombie_hand/proc/growl(mob/user)
if(removing_airlock)
playsound(src.loc, 'sound/hallucinations/growl3.ogg', 50, 1)
user.audible_message("<span class='warning'>[user] growls as [user.p_their()] claws dig into the metal frame...</span>")
user.audible_message("<span class='warning'>[user] growls as \
their claws dig into the metal frame...</span>")
/obj/item/zombie_hand/suicide_act(mob/living/carbon/user)
// Suiciding as a zombie brings someone else in to play it
@@ -94,8 +99,10 @@
user.Weaken(30)
var/success = offer_control(user)
if(success)
user.visible_message("<span class='suicide'>[user] appears to have found new spirit.</span>")
user.visible_message("<span class='suicide'>[user] appears to have \
found new spirit.</span>")
return SHAME
else
user.visible_message("<span class='suicide'>[user] stops moving.</span>")
user.visible_message("<span class='suicide'>[user] stops moving.\
</span>")
return OXYLOSS
code/modules/zombie/organs.dm
+5 -2
View File
@@ -52,12 +52,15 @@
owner.revive(full_heal = TRUE)
switch(old_stat)
if(DEAD, UNCONSCIOUS)
owner.visible_message("<span class='danger'>[owner] staggers to [owner.p_their()] feet!</span>")
owner.visible_message("<span class='danger'>[owner] staggers to \
their feet!</span>")
owner << "<span class='danger'>You stagger to your feet!</span>"
// Conscious conversions will generally only happen for an event
// or for a converts_living=TRUE infection
if(CONSCIOUS)
owner.visible_message("<span class='danger'>[owner] suddenly convulses, as [owner.p_they()] gain a ravenous hunger in [owner.p_their()] eyes!</span>",
owner.visible_message("<span class='danger'>[owner] suddenly \
convulses, as they gain a ravenous hunger in their \
eyes!</span>",
"<span class='alien'>You HUNGER!</span>")
playsound(owner.loc, 'sound/hallucinations/growl3.ogg', 50, 1)
owner.do_jitter_animation(living_transformation_time)