mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
[PATCH 056/285] TG UPdates: fingerprints on cans now log on any attackby() that isn't a wrench/analyzer/pda/tank; added a 2 minute
countdown var to humans/monkeys that resets when move() is called;(for an actual fix to the cuffbreak bug(NOPE, NOT ACTUALLY IN ~Hawk.)) changed a typo in security levels committed a gib animation fix for Sieve (todo: make custom gib animations for simple_animals/metroids)
This commit is contained in:
@@ -765,7 +765,7 @@
|
||||
|
||||
for(var/mob/living/carbon/metroid/M in view(1,src))
|
||||
M.UpdateFeed(src)
|
||||
|
||||
src.moved_recently = 120
|
||||
return
|
||||
|
||||
/mob/living/carbon/human/update_clothing()
|
||||
@@ -2643,4 +2643,4 @@ It can still be worn/put on as normal.
|
||||
|
||||
/mob/living/carbon/human/proc/check_dna()
|
||||
dna.check_integrity(src)
|
||||
return
|
||||
return
|
||||
|
||||
@@ -121,6 +121,7 @@
|
||||
|
||||
..() //for organs
|
||||
|
||||
src.moved_recently = max(0, moved_recently-1)
|
||||
|
||||
/mob/living/carbon/human
|
||||
proc
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
step(src, pick(cardinal))
|
||||
if(prob(1))
|
||||
emote(pick("scratch","jump","roll","tail"))
|
||||
|
||||
src.moved_recently = max(0, src.moved_recently-1)
|
||||
|
||||
/mob/living/carbon/monkey
|
||||
proc
|
||||
|
||||
@@ -560,7 +560,7 @@
|
||||
|
||||
for(var/mob/living/carbon/metroid/M in view(1,src))
|
||||
M.UpdateFeed(src)
|
||||
|
||||
src.moved_recently = 120
|
||||
return
|
||||
|
||||
/mob/living/carbon/monkey/verb/removeinternal()
|
||||
|
||||
@@ -786,6 +786,14 @@
|
||||
flick("gibbed-h", animation)
|
||||
else if(ismonkey(src))
|
||||
flick("gibbed-m", animation)
|
||||
else if(ismetroid(src))
|
||||
flick("gibbed-m", animation)
|
||||
else if(iscrab(src))
|
||||
flick("gibbed-m", animation)
|
||||
else if(iscorgi(src))
|
||||
flick("gibbed-m", animation)
|
||||
else if(iscat(src))
|
||||
flick("gibbed-m", animation) //New-has monkey gib effect versus robogib
|
||||
else if(isalien(src))
|
||||
flick("gibbed-a", animation)
|
||||
else
|
||||
@@ -800,6 +808,14 @@
|
||||
else
|
||||
gibs(loc, viruses, dna)
|
||||
|
||||
/* else if(key)
|
||||
if(istype(src, /mob/living/simple_animals)) //Should gib all simple_animals like a monkey
|
||||
gibs(loc, viruses)
|
||||
else if (istype(src, /mob/living/simple_animals))
|
||||
gibs(loc, viruses)
|
||||
Currently doesn't work, but should be useful later or at least as a template
|
||||
*/
|
||||
|
||||
else
|
||||
if(istype(src, /mob/living/silicon))
|
||||
robogibs(loc, viruses)
|
||||
|
||||
@@ -50,6 +50,16 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/proc/iscrab(A)
|
||||
if(istype(A, /mob/living/simple_animal/crab))
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/proc/iscat(A)
|
||||
if(istype(A, /mob/living/simple_animal/cat))
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/proc/istajaran(A)
|
||||
if(istype(A, /mob/living/carbon/human/tajaran))
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user