From 0b25a0ed020ecd3d80d505030eb82d50b62bcfc8 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Thu, 23 Jun 2016 04:20:02 -0400 Subject: [PATCH] Fixes snpc PDA bug, heavily reduces rate that snpc chef does their thing (#4742) --- .../mob/living/carbon/human/interactive/functions.dm | 8 +++++++- .../mob/living/carbon/human/interactive/interactive.dm | 9 ++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm index b0806e66241..c1b22e721f2 100644 --- a/code/modules/mob/living/carbon/human/interactive/functions.dm +++ b/code/modules/mob/living/carbon/human/interactive/functions.dm @@ -433,7 +433,7 @@ return 1 /mob/living/carbon/human/interactive/proc/souschef(obj) - if(shouldModulePass() || enforceHome() || prob(SNPC_FUZZY_CHANCE_LOW)) + if(shouldModulePass() || enforceHome() || prob(SNPC_FUZZY_CHANCE_HIGH) || prob(SNPC_FUZZY_CHANCE_HIGH)) return if(doing & SNPC_SPECIAL) @@ -776,6 +776,12 @@ else return "[word]ed" +/mob/living/carbon/human/interactive/proc/ing_verb(word) + if(copytext(word, length(word)) == "e") + return "[copytext(word, 1, length(word))]ing" + else + return "[word]ing" + /mob/living/carbon/human/interactive/proc/paperwork_sentence() var/verbs_use = pick_list(speak_file, "verbs_use") var/verbs_touch = pick_list(speak_file, "verbs_touch") diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm index 14402788451..9e4b77f055f 100644 --- a/code/modules/mob/living/carbon/human/interactive/interactive.dm +++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm @@ -258,12 +258,15 @@ RPID.access = myjob.get_access() equip_to_slot_or_del(MYID, slot_wear_id) - MYPDA = new(src) + if(wear_pda) + MYPDA = wear_pda + else + MYPDA = new(src) + equip_to_slot_or_del(MYPDA, slot_wear_pda) MYPDA.owner = real_name MYPDA.ownjob = alt_title MYPDA.ownrank = job MYPDA.name = "PDA-[real_name] ([alt_title])" - equip_to_slot_or_del(MYPDA, slot_belt) zone_sel.selecting = "chest" //arms if(prob((SNPC_FUZZY_CHANCE_LOW+SNPC_FUZZY_CHANCE_HIGH)/4)) @@ -836,7 +839,7 @@ return 0 if(myPath.len <= 0) - myPath = get_path_to(src, get_turf(target), /turf/proc/Distance, SNPC_MAX_RANGE_FIND + 1, 250,1, id=Path_ID) + myPath = get_path_to(src, get_turf(target), /turf/proc/Distance, SNPC_MAX_RANGE_FIND + 1, 250,1, id=Path_ID, simulated_only = 0) if(myPath) if(myPath.len > 0)