cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes simple_animal me command and mice making clonking noises in disposals.

Browse Source
This commit is contained in:
Erthilo
2012-08-18 18:26:39 +01:00
parent eff2a042bc
commit e68e49fdb9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/simple_animal/simple_animal_misc.dm
View File

@@ -41,12 +41,11 @@
for(var/mob/M in view(src,7)) for(var/mob/M in view(src,7))
M << "<b>[src]</b> [pick(speak_emote)], \"[message]\"" M << "<b>[src]</b> [pick(speak_emote)], \"[message]\""
/mob/living/simple_animal/emote(var/message = null, var/m_type=1, var/act = "auto") /mob/living/simple_animal/emote(var/act = "auto", var/m_type=1, var/message = null)
switch(act) switch(act)
if ("scream") if ("scream")
message = "<B>[src]</B> makes a loud and pained whimper" message = "<B>[src]</B> makes a loud and pained whimper"
m_type = 2 m_type = 2
if ("custom") if ("custom")
var/input = copytext(sanitize(input("Choose an emote to display.") as text|null),1,MAX_MESSAGE_LEN) var/input = copytext(sanitize(input("Choose an emote to display.") as text|null),1,MAX_MESSAGE_LEN)
if (!input) if (!input)
@@ -60,7 +59,6 @@
alert("Unable to use this emote, must be either hearable or visible.") alert("Unable to use this emote, must be either hearable or visible.")
return return
message = "<B>[src]</B> [input]" message = "<B>[src]</B> [input]"
if ("me") if ("me")
if(silent) if(silent)
return return

2
code/modules/recycling/disposal.dm
View File

@@ -694,6 +694,8 @@
M.weakened += 2 M.weakened += 2
if(prob(20)) if(prob(20))
M.paralysis += 2 M.paralysis += 2
if(istype(M,/mob/living/simple_animal/mouse))
continue
if(istype(M,/mob/living/carbon/human)) if(istype(M,/mob/living/carbon/human))
var/name = pick(M:organs) var/name = pick(M:organs)
var/datum/organ/external/temp = M:organs[name] var/datum/organ/external/temp = M:organs[name]