From 13ccd7533f224f7f9b60a9954ebffc48d4ac87bd Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 27 Apr 2019 20:04:03 -0500 Subject: [PATCH 1/3] Removes Resident from the Southern Cross --- code/datums/outfits/jobs/civilian.dm | 3 +++ code/game/jobs/job/assistant.dm | 10 ++++++++++ maps/northern_star/job/outfits.dm | 6 ++++++ maps/northern_star/northern_star.dm | 2 ++ maps/northern_star/northern_star_defines.dm | 2 +- maps/northern_star/northern_star_jobs.dm | 9 +++++++++ maps/southern_cross/southern_cross_defines.dm | 2 +- 7 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 maps/northern_star/job/outfits.dm create mode 100644 maps/northern_star/northern_star_jobs.dm diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index f3237249b1a..9ba84943e6c 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -7,6 +7,7 @@ id_pda_assignment = "Visitor" uniform = /obj/item/clothing/under/assistantformal +<<<<<<< HEAD /decl/hierarchy/outfit/job/assistant/resident name = OUTFIT_JOB_NAME("Resident") id_pda_assignment = "Resident" @@ -16,6 +17,8 @@ name = OUTFIT_JOB_NAME("Intern") id_type = /obj/item/weapon/card/id/civilian //VOREStation Add End - Interns +======= +>>>>>>> 1e71944... Merge pull request #6137 from Neerti/it's_time_to_stop /decl/hierarchy/outfit/job/service l_ear = /obj/item/device/radio/headset/headset_service hierarchy_type = /decl/hierarchy/outfit/job/service diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 5d7b7713983..00cbe8e4223 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -39,12 +39,22 @@ access = list() minimal_access = list() outfit_type = /decl/hierarchy/outfit/job/assistant +<<<<<<< HEAD timeoff_factor = 0 /datum/job/assistant/New() ..() if(config) total_positions = config.limit_visitors spawn_positions = config.limit_visitors +======= + alt_titles = list( + "Technical Assistant", + "Medical Intern", + "Research Assistant", + "Visitor" = /decl/hierarchy/outfit/job/assistant/visitor + ) + +>>>>>>> 1e71944... Merge pull request #6137 from Neerti/it's_time_to_stop /datum/job/assistant/get_access() if(config.assistant_maint) return list(access_maint_tunnels) diff --git a/maps/northern_star/job/outfits.dm b/maps/northern_star/job/outfits.dm new file mode 100644 index 00000000000..5166dd87aac --- /dev/null +++ b/maps/northern_star/job/outfits.dm @@ -0,0 +1,6 @@ +//Job Outfits + +/decl/hierarchy/outfit/job/assistant/resident + name = OUTFIT_JOB_NAME("Resident") + id_pda_assignment = "Resident" + uniform = /obj/item/clothing/under/color/white \ No newline at end of file diff --git a/maps/northern_star/northern_star.dm b/maps/northern_star/northern_star.dm index ece26300960..770d3b89df9 100644 --- a/maps/northern_star/northern_star.dm +++ b/maps/northern_star/northern_star.dm @@ -9,6 +9,8 @@ #include "northern_star_defines.dm" #include "northern_star_areas.dm" #include "northern_star_shuttles.dm" + #include "northern_star_jobs.dm" + #include "job/outfits.dm" #define USING_MAP_DATUM /datum/map/northern_star diff --git a/maps/northern_star/northern_star_defines.dm b/maps/northern_star/northern_star_defines.dm index b769b1754bb..8cf1820c78c 100644 --- a/maps/northern_star/northern_star_defines.dm +++ b/maps/northern_star/northern_star_defines.dm @@ -27,7 +27,7 @@ shuttle_docked_message = "The scheduled shuttle to the %dock_name% has docked with the station at docks one and two. It will depart in approximately %ETD%." shuttle_leaving_dock = "The Crew Transfer Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%." - shuttle_called_message = "A crew transfer to %Dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to docks one and two in approximately %ETA%." + shuttle_called_message = "A crew transfer to %dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to docks one and two in approximately %ETA%." shuttle_recall_message = "The scheduled crew transfer has been cancelled." emergency_shuttle_docked_message = "The Emergency Shuttle has docked with the station at docks one and two. You have approximately %ETD% to board the Emergency Shuttle." emergency_shuttle_leaving_dock = "The Emergency Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%." diff --git a/maps/northern_star/northern_star_jobs.dm b/maps/northern_star/northern_star_jobs.dm new file mode 100644 index 00000000000..fe0b5a1310a --- /dev/null +++ b/maps/northern_star/northern_star_jobs.dm @@ -0,0 +1,9 @@ +// Overrides the alt titles. +/datum/job/assistant + alt_titles = list( + "Technical Assistant", + "Medical Intern", + "Research Assistant", + "Visitor" = /decl/hierarchy/outfit/job/assistant/visitor, + "Resident" = /decl/hierarchy/outfit/job/assistant/resident + ) \ No newline at end of file diff --git a/maps/southern_cross/southern_cross_defines.dm b/maps/southern_cross/southern_cross_defines.dm index f55067f0a32..7a9f0a52a38 100644 --- a/maps/southern_cross/southern_cross_defines.dm +++ b/maps/southern_cross/southern_cross_defines.dm @@ -37,7 +37,7 @@ shuttle_docked_message = "The scheduled shuttle to the %dock_name% has docked with the station at docks one and two. It will depart in approximately %ETD%." shuttle_leaving_dock = "The Crew Transfer Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%." - shuttle_called_message = "A crew transfer to %Dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to docks one and two in approximately %ETA%." + shuttle_called_message = "A crew transfer to %dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to docks one and two in approximately %ETA%." shuttle_recall_message = "The scheduled crew transfer has been cancelled." emergency_shuttle_docked_message = "The Emergency Shuttle has docked with the station at docks one and two. You have approximately %ETD% to board the Emergency Shuttle." emergency_shuttle_leaving_dock = "The Emergency Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%." From 536d209e295d9874bd3aab188fe1624b2894d52c Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 27 Apr 2019 22:33:06 -0400 Subject: [PATCH 2/3] Update civilian.dm --- code/datums/outfits/jobs/civilian.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 9ba84943e6c..8e7f72815c5 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -6,19 +6,11 @@ name = OUTFIT_JOB_NAME("Visitor") id_pda_assignment = "Visitor" uniform = /obj/item/clothing/under/assistantformal - -<<<<<<< HEAD -/decl/hierarchy/outfit/job/assistant/resident - name = OUTFIT_JOB_NAME("Resident") - id_pda_assignment = "Resident" - uniform = /obj/item/clothing/under/color/white //VOREStation Add - Interns /decl/hierarchy/outfit/job/assistant/intern name = OUTFIT_JOB_NAME("Intern") id_type = /obj/item/weapon/card/id/civilian //VOREStation Add End - Interns -======= ->>>>>>> 1e71944... Merge pull request #6137 from Neerti/it's_time_to_stop /decl/hierarchy/outfit/job/service l_ear = /obj/item/device/radio/headset/headset_service hierarchy_type = /decl/hierarchy/outfit/job/service From 2f4c8a8ce1d7fb3917aa76c6adfb77f7f8954163 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 27 Apr 2019 22:35:05 -0400 Subject: [PATCH 3/3] Update assistant.dm --- code/game/jobs/job/assistant.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 00cbe8e4223..b79314b8716 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -39,22 +39,13 @@ access = list() minimal_access = list() outfit_type = /decl/hierarchy/outfit/job/assistant -<<<<<<< HEAD timeoff_factor = 0 /datum/job/assistant/New() ..() if(config) total_positions = config.limit_visitors spawn_positions = config.limit_visitors -======= - alt_titles = list( - "Technical Assistant", - "Medical Intern", - "Research Assistant", - "Visitor" = /decl/hierarchy/outfit/job/assistant/visitor - ) ->>>>>>> 1e71944... Merge pull request #6137 from Neerti/it's_time_to_stop /datum/job/assistant/get_access() if(config.assistant_maint) return list(access_maint_tunnels)