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

Fix for possible runtimes in say.dm

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3402 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
VivianFoxfoot@gmail.com
2012-04-05 00:24:27 +00:00
parent 2a59482e6c
commit afeddc2175
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/say.dm
View File

@@ -133,8 +133,8 @@
//world << "channel_prefix=[channel_prefix]; message_mode=[message_mode]"
if (message_mode)
message = trim(copytext(message, 3))
//if (!ishuman(src) && (message_mode=="department" || (message_mode in radiochannels)))
// message_mode = null //only humans can use headsets
if (!(ishuman(src) || istype(src, /mob/living/simple_animal)) && (message_mode=="department" || (message_mode in radiochannels)))
message_mode = null //only humans can use headsets
// Check removed so parrots can use headsets!
if (!message)

2
code/modules/mob/simple_animal/life.dm
View File

@@ -50,6 +50,8 @@
var/wall_smash = 0 //if they can smash walls
var/speed = 0 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster
var/obj/item/device/radio/headset/ears = null
/mob/living/simple_animal/New()
..()
verbs -= /mob/verb/observe

2
code/modules/mob/simple_animal/parrot.dm
View File

@@ -16,7 +16,7 @@
response_disarm = "gently moves aside the"
response_harm = "swats the"
var/obj/item/device/radio/headset/ears = new /obj/item/device/radio/headset/heads/ce()
ears = new /obj/item/device/radio/headset/heads/ce()
/mob/living/simple_animal/parrot/DrProfessor
name = "Doctor Professor Parrot, PhD"