From 2500e241ca18340bb08fdd0928ac2bcde1178052 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Sat, 30 Jan 2016 07:07:32 -0600 Subject: [PATCH] Re-implement lizard hissing Note that this reverts #13656, due to this bug (http://www.byond.com/forum/?post=2027070) --- code/controllers/subsystem/jobs.dm | 2 +- code/modules/mob/living/carbon/human/species_types.dm | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 8dea8c82e2f..9403b54bb2c 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -428,7 +428,7 @@ var/datum/subsystem/job/SSjob /datum/subsystem/job/proc/LoadJobs() var/jobstext = return_file_text("config/jobs.txt") for(var/datum/job/J in occupations) - var/regex/jobs = regex("[J.title]=(-1|\\d+),(-1|\\d+)") + var/regex/jobs = new("[J.title]=(-1|\\d+),(-1|\\d+)") jobs.Find(jobstext) J.total_positions = text2num(jobs.group[2]) J.spawn_positions = text2num(jobs.group[3]) diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 7af4241e18d..0c3c10150f4 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -74,10 +74,11 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) return randname -/datum/species/lizard/qualifies_for_rank(rank, list/features) - if(rank in command_positions) - return 0 - return 1 +/datum/species/lizard/handle_speech(message) + if(copytext(message, 1, 2) != "*") + message = replacetextEx(message, "s", "sss") + message = replacetextEx(message, "S", "SSS") + return message //I wag in death /datum/species/lizard/spec_death(gibbed, mob/living/carbon/human/H)