From 520d294c8d8ef109fcbf7e75adc908f670a8102a Mon Sep 17 00:00:00 2001 From: Werner Date: Sun, 13 May 2018 17:07:44 +0200 Subject: [PATCH] Moves the Janitor Back to Civilian (#4716) The Janitor is moved back to civilian. --- aurorastation.dme | 2 +- code/game/jobs/job/captain.dm | 4 +- code/game/jobs/job/civilian.dm | 30 ++++++++++++ code/game/jobs/job/engineering.dm | 34 ++----------- code/game/jobs/jobs.dm | 22 ++++----- code/game/machinery/vending.dm | 5 +- code/game/objects/items/devices/PDA/PDA.dm | 4 +- .../mob/living/silicon/robot/robot_modules.dm | 6 ++- html/changelogs/arrow768-janitorial.yml | 37 ++++++++++++++ maps/aurora/aurora-4_mainlevel.dmm | 49 +++++++++---------- 10 files changed, 115 insertions(+), 78 deletions(-) create mode 100644 html/changelogs/arrow768-janitorial.yml diff --git a/aurorastation.dme b/aurorastation.dme index cab35ca6c64..2f02b8d563c 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -191,8 +191,8 @@ #include "code\controllers\subsystems\zcopy.dm" #include "code\controllers\subsystems\initialization\atlas.dm" #include "code\controllers\subsystems\initialization\atoms.dm" -#include "code\controllers\subsystems\initialization\map_finalization.dm" #include "code\controllers\subsystems\initialization\holomap.dm" +#include "code\controllers\subsystems\initialization\map_finalization.dm" #include "code\controllers\subsystems\initialization\misc_early.dm" #include "code\controllers\subsystems\initialization\misc_late.dm" #include "code\controllers\subsystems\initialization\xenoarch.dm" diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 9cc0c586803..47428e8bc01 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -77,12 +77,12 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) access = list(access_sec_doors, access_medical, access_engine, access_change_ids, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, - access_chapel_office, access_library, access_research, access_mining, access_mining_station, + access_chapel_office, access_library, access_research, access_mining, access_mining_station, access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons) minimal_access = list(access_sec_doors, access_medical, access_engine, access_change_ids, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, - access_chapel_office, access_library, access_research, access_mining, access_mining_station, + access_chapel_office, access_library, access_research, access_mining, access_mining_station, access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 836e5deb9f7..b3589cd092e 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -186,6 +186,36 @@ H.species.equip_survival_gear(H,1) return TRUE +//Not engineers, just the mop boys +/datum/job/janitor + title = "Janitor" + flag = JANITOR + department = "Civilian" + department_flag = CIVILIAN + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the head of personnel" + selection_color = "#dddddd" + access = list(access_janitor, access_maint_tunnels, access_engine, access_research, access_sec_doors, access_medical) + minimal_access = list(access_janitor, access_maint_tunnels, access_engine, access_research, access_sec_doors, access_medical) + + bag_type = /obj/item/weapon/storage/backpack + satchel_type = /obj/item/weapon/storage/backpack/satchel_norm + duffel_type = /obj/item/weapon/storage/backpack/satchel + messenger_bag_type = /obj/item/weapon/storage/backpack/duffel + + + equip(var/mob/living/carbon/human/H) + if(!H) + return FALSE + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/janitor(H), slot_belt) + return TRUE + + //More or less assistants /datum/job/librarian title = "Librarian" diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 153225bf0f8..29229bd0679 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -18,11 +18,11 @@ access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, - access_heads, access_construction, access_sec_doors, access_research, access_medical, access_janitor, + access_heads, access_construction, access_sec_doors, access_research, access_medical, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload) minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, - access_heads, access_construction, access_sec_doors, access_research, access_medical, access_janitor, + access_heads, access_construction, access_sec_doors, access_research, access_medical, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload) minimal_player_age = 7 @@ -133,32 +133,4 @@ if(!H) return FALSE H.species.equip_survival_gear(H,1) - return TRUE - -/datum/job/janitor - title = "Janitor" - flag = JANITOR - department = "Engineering" - department_flag = ENGSEC - faction = "Station" - total_positions = 2 - spawn_positions = 2 - supervisors = "the chief engineer" - selection_color = "#fff5cc" - access = list(access_janitor, access_maint_tunnels, access_engine, access_research, access_sec_doors, access_medical) - minimal_access = list(access_janitor, access_maint_tunnels, access_engine, access_research, access_sec_doors, access_medical) - - bag_type = /obj/item/weapon/storage/backpack - satchel_type = /obj/item/weapon/storage/backpack/satchel_norm - duffel_type = /obj/item/weapon/storage/backpack/satchel - messenger_bag_type = /obj/item/weapon/storage/backpack/duffel - - - equip(var/mob/living/carbon/human/H) - if(!H) - return FALSE - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/device/pda/janitor(H), slot_belt) - return TRUE + return TRUE \ No newline at end of file diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index c031290d947..3ca49d261ae 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -14,7 +14,6 @@ var/const/CYBORG =(1<<9) var/const/INTERN_SEC =(1<<10) var/const/INTERN_ENG =(1<<11) var/const/FORENSICS =(1<<12) -var/const/JANITOR =(1<<13) var/const/MEDSCI =(1<<1) @@ -39,16 +38,17 @@ var/const/HOP =(1<<0) var/const/BARTENDER =(1<<1) var/const/BOTANIST =(1<<2) var/const/CHEF =(1<<3) -var/const/LIBRARIAN =(1<<4) -var/const/QUARTERMASTER =(1<<5) -var/const/CARGOTECH =(1<<6) -var/const/MINER =(1<<7) -var/const/LAWYER =(1<<8) -var/const/CHAPLAIN =(1<<9) -var/const/CLOWN =(1<<10) -var/const/MIME =(1<<11) -var/const/MERCHANT =(1<<12) -var/const/ASSISTANT =(1<<13) +var/const/JANITOR =(1<<4) +var/const/LIBRARIAN =(1<<5) +var/const/QUARTERMASTER =(1<<6) +var/const/CARGOTECH =(1<<7) +var/const/MINER =(1<<8) +var/const/LAWYER =(1<<9) +var/const/CHAPLAIN =(1<<10) +var/const/CLOWN =(1<<11) +var/const/MIME =(1<<12) +var/const/MERCHANT =(1<<13) +var/const/ASSISTANT =(1<<14) var/list/assistant_occupations = list() //Leaving this on one line stops Travis complaining ~Scopes diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 33af2876cc9..36f411d1521 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -98,7 +98,8 @@ var/datum/wires/vending/wires = null var/can_move = 1 //if you can wrench the machine out of place - var/vend_id = "generic" + var/vend_id = "generic" //Id of the refill cartridge that has to be used + var/restock_items = 0 //If items can be restocked into the vending machine /obj/machinery/vending/Initialize() . = ..() @@ -270,7 +271,7 @@ else if(!is_borg_item(W)) for(var/datum/data/vending_product/R in product_records) - if(istype(W, R.product_path)) + if(istype(W, R.product_path) && restock_items) stock(R, user) qdel(W) return diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 833159567ee..ea55f23dd5f 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -449,7 +449,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(P.icon_state == "pda-hos"||P.icon_state == "pda-warden"||P.icon_state == "pda-det"||P.icon_state == "pda-sec"||P.icon_state == "pda-s") pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0"))) if(4) //eng - if(P.icon_state == "pda-ce"||P.icon_state == "pda-e"||P.icon_state == "pda-atmo"||P.icon_state == "pda-j") + if(P.icon_state == "pda-ce"||P.icon_state == "pda-e"||P.icon_state == "pda-atmo") pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0"))) if(5) //sci if(P.icon_state == "pda-rd"||P.icon_state == "pda-tox"||P.icon_state == "pda-v"||P.icon_state == "pda-robot") @@ -458,7 +458,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(P.icon_state == "pda-hop"||P.icon_state == "pda-cargo"||P.icon_state == "pda-q"||P.icon_state == "pda-miner") pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0"))) if(7) //service - if(P.icon_state == "pda-hop"||P.icon_state == "pda-bar"||P.icon_state == "pda-holy"||P.icon_state == "pda-lawyer"||P.icon_state == "pda-libb"||P.icon_state == "pda-hydro"||P.icon_state == "pda-chef") + if(P.icon_state == "pda-hop"||P.icon_state == "pda-bar"||P.icon_state == "pda-holy"||P.icon_state == "pda-lawyer"||P.icon_state == "pda-libb"||P.icon_state == "pda-hydro"||P.icon_state == "pda-chef"||P.icon_state == "pda-j") pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0"))) if(8) //medical if(P.icon_state == "pda-cmo"||P.icon_state == "pda-v"||P.icon_state == "pda-m"||P.icon_state == "pda-chem") diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index af885b34d19..ebaf3a715a2 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -564,8 +564,8 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/janitor name = "custodial robot module" - channels = list("Engineering" = 1) - networks = list(NETWORK_ENGINEERING) + channels = list("Service" = 1) + networks = list(NETWORK_SERVICE) sprites = list( "Basic" = "robotjani", "Mopbot" = "janitorrobot", @@ -601,6 +601,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/clerical name = "service robot module" channels = list("Service" = 1) + networks = list(NETWORK_SERVICE) languages = list( LANGUAGE_SOL_COMMON = 1, LANGUAGE_TRADEBAND = 1, @@ -719,6 +720,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/research name = "research module" channels = list("Science" = 1) + networks = list(NETWORK_RESEARCH) sprites = list( "Droid" = "droid-science", "Drone" = "drone-science", diff --git a/html/changelogs/arrow768-janitorial.yml b/html/changelogs/arrow768-janitorial.yml new file mode 100644 index 00000000000..d73eea442dc --- /dev/null +++ b/html/changelogs/arrow768-janitorial.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Arrow768 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Due to protests from the \"real\" engineers, the janitor is no longer part of the engineering department and has been reintegrated into the service department." diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 80701fc6be0..fe1e97a53b2 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -28262,15 +28262,15 @@ /turf/simulated/floor/tiled, /area/janitor) "aYg" = ( -/obj/machinery/door/airlock/engineering{ - name = "Custodial Technician"; - req_access = list(26) - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock{ + name = "Custodial Closet"; + req_access = list(26) + }, /turf/simulated/floor/tiled, /area/janitor) "aYh" = ( @@ -28990,8 +28990,8 @@ /turf/simulated/floor/tiled, /area/janitor) "aZx" = ( -/obj/machinery/camera/network/engineering{ - c_tag = "Engineering - Janitor"; +/obj/machinery/camera/network/service{ + c_tag = "Janitor - Garage"; dir = 1 }, /turf/simulated/floor/tiled, @@ -29624,12 +29624,12 @@ /turf/simulated/floor/plating, /area/maintenance/maintcentral) "baG" = ( -/obj/machinery/door/airlock/engineering{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ name = "Custodial Closet"; req_access = list(26) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/janitor) "baH" = ( @@ -32735,8 +32735,8 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/camera/network/engineering{ - c_tag = "Engineering - Janitor's Closet"; +/obj/machinery/camera/network/service{ + c_tag = "Janitor - Main Storage"; dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -33451,8 +33451,7 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "bhx" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/vending/tool, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/janitor) "bhy" = ( @@ -35084,20 +35083,16 @@ /area/bridge/minibar) "bkd" = ( /obj/structure/table/rack, -/obj/item/stack/material/glass{ - amount = 20; - pixel_x = -4; - pixel_y = 4 +/obj/item/weapon/paper_bin{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/paper_bin, +/obj/item/weapon/paper_bin{ + pixel_x = -6; + pixel_y = 6 }, /obj/machinery/light/small, -/obj/item/stack/material/glass/reinforced{ - amount = 50 - }, -/obj/item/stack/material/steel{ - amount = 20; - pixel_x = 4; - pixel_y = -4 - }, /turf/simulated/floor/tiled/dark, /area/janitor) "bke" = ( @@ -80534,7 +80529,7 @@ beI beI bhw bjb -bke +bhx aKi bmY aKi @@ -80791,7 +80786,7 @@ beJ beJ bhx bbZ -bkf +bhx aKi bmY aKi