From b670cdcdf1818c402ad0cf1232423cc9c9d0d934 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 4 Jul 2014 17:48:12 +0930 Subject: [PATCH] Fixes #5483 --- code/WorkInProgress/Sigyn/Softcurity/access.dm | 4 ++-- code/datums/datacore.dm | 4 ++-- code/game/jobs/jobs.dm | 2 +- code/modules/events/event_dynamic.dm | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/WorkInProgress/Sigyn/Softcurity/access.dm b/code/WorkInProgress/Sigyn/Softcurity/access.dm index d0dace17bf7..de0179fad45 100644 --- a/code/WorkInProgress/Sigyn/Softcurity/access.dm +++ b/code/WorkInProgress/Sigyn/Softcurity/access.dm @@ -198,7 +198,7 @@ return list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) if("Medical Doctor") return list(access_medical, access_morgue, access_surgery) - if("Botanist") // -- TLE + if("Gardener") // -- TLE return list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. if("Librarian") // -- TLE return list(access_library) @@ -496,7 +496,7 @@ return "Code Gold" /proc/get_all_jobs() - return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician", + return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Gardener", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", "Atmospheric Technician", "Roboticist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Research Director", "Scientist", "Head of Security", "Warden", "Detective", "Security Officer") diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 6d578e585e7..98da4a58ded 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -146,7 +146,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H) if(E.status & ORGAN_ROBOT) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0)) preview_icon.Blend(temp, ICON_OVERLAY) - + //Tail if(H.species.tail && H.species.flags & HAS_TAIL) temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.species.tail]_s") @@ -188,7 +188,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H) if("Bartender") clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - if("Botanist") + if("Gardener") clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) if("Chef") diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index d13756bd9ee..b139711f436 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -87,7 +87,7 @@ var/list/science_positions = list( var/list/civilian_positions = list( "Head of Personnel", "Bartender", - "Botanist", + "Gardener", "Chef", "Janitor", "Librarian", diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index ccdfd06e710..3db6f6137f7 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -63,7 +63,7 @@ var/list/event_last_fired = list() possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 possibleEvents[/datum/event/grid_check] = 25 + 10 * active_with_role["Engineer"] possibleEvents[/datum/event/electrical_storm] = 15 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] - possibleEvents[/datum/event/wallrot] = 30 * active_with_role["Engineer"] + 50 * active_with_role["Botanist"] + possibleEvents[/datum/event/wallrot] = 30 * active_with_role["Engineer"] + 50 * active_with_role["Gardener"] if(!spacevines_spawned) possibleEvents[/datum/event/spacevine] = 10 + 5 * active_with_role["Engineer"] @@ -189,7 +189,7 @@ var/list/event_last_fired = list() active_with_role["AI"] = 0 active_with_role["Cyborg"] = 0 active_with_role["Janitor"] = 0 - active_with_role["Botanist"] = 0 + active_with_role["Gardener"] = 0 for(var/mob/M in player_list) if(!M.mind || !M.client || M.client.inactivity > 10 * 10 * 60) // longer than 10 minutes AFK counts them as inactive @@ -222,7 +222,7 @@ var/list/event_last_fired = list() if(M.mind.assigned_role == "Janitor") active_with_role["Janitor"]++ - if(M.mind.assigned_role == "Botanist") - active_with_role["Botanist"]++ + if(M.mind.assigned_role == "Gardener") + active_with_role["Gardener"]++ return active_with_role