cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes nations and banners not using global job lists (#269)

Browse Source 
* Fixes nations and banners not using global job lists (#52763)

* Fixes nations and banners not using global job lists

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-08-10 23:21:36 +01:00
committed by GitHub
co-authored by ShizCalev
parent ecb08ef4a7
commit ea9b245d16
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/religion.dm
+24 -6
View File
@@ -81,9 +81,12 @@
inhand_icon_state = "banner_security"
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
job_loyalties = list("Security Officer", "Warden", "Detective", "Head of Security")
warcry = "EVERYONE DOWN ON THE GROUND!!"
/obj/item/banner/security/Initialize()
. = ..()
job_loyalties = GLOB.security_positions
/obj/item/banner/security/mundane
inspiration_available = FALSE
@@ -102,9 +105,12 @@
inhand_icon_state = "banner_medical"
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
job_loyalties = list("Medical Doctor", "Chemist", "Virologist", "Chief Medical Officer")
warcry = "No wounds cannot be healed!"
/obj/item/banner/medical/Initialize()
. = ..()
job_loyalties = GLOB.medical_positions
/obj/item/banner/medical/mundane
inspiration_available = FALSE
@@ -131,9 +137,12 @@
inhand_icon_state = "banner_science"
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
job_loyalties = list("Scientist", "Roboticist", "Research Director", "Geneticist",)
warcry = "For Cuban Pete!"
/obj/item/banner/science/Initialize()
. = ..()
job_loyalties = GLOB.science_positions
/obj/item/banner/science/mundane
inspiration_available = FALSE
@@ -155,9 +164,12 @@
inhand_icon_state = "banner_cargo"
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
job_loyalties = list("Cargo Technician", "Shaft Miner", "Quartermaster")
warcry = "Hail Cargonia!"
/obj/item/banner/cargo/Initialize()
. = ..()
job_loyalties = GLOB.supply_positions
/obj/item/banner/cargo/mundane
inspiration_available = FALSE
@@ -176,9 +188,12 @@
inhand_icon_state = "banner_engineering"
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
job_loyalties = list("Station Engineer", "Atmospheric Technician", "Chief Engineer")
warcry = "All hail lord Singuloth!!"
/obj/item/banner/engineering/Initialize()
. = ..()
job_loyalties = GLOB.engineering_positions
/obj/item/banner/engineering/mundane
inspiration_available = FALSE
@@ -197,9 +212,12 @@
name = "command banner"
desc = "The banner of Command, a staunch and ancient line of bueraucratic kings and queens."
//No icon state here since the default one is the NT banner
job_loyalties = list("Captain", "Head of Personnel", "Chief Engineer", "Head of Security", "Research Director", "Chief Medical Officer")
warcry = "Hail Nanotrasen!"
/obj/item/banner/command/Initialize()
. = ..()
job_loyalties = GLOB.command_positions
/obj/item/banner/command/mundane
inspiration_available = FALSE
code/modules/events/wizard/departmentrevolt.dm
+7 -7
View File
@@ -18,19 +18,19 @@
jobs_to_revolt = list("Assistant")
nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi")
if("white")
jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Geneticist", "Virologist")
nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych")
jobs_to_revolt = GLOB.medical_positions
nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Viro", "Psych")
if("yellow")
jobs_to_revolt = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
jobs_to_revolt = GLOB.engineering_positions
nation_name = pick("Atomo", "Engino", "Power", "Teleco")
if("purple")
jobs_to_revolt = list("Research Director","Scientist", "Roboticist")
nation_name = pick("Sci", "Griffa", "Explosi", "Mecha", "Xeno")
jobs_to_revolt = GLOB.science_positions
nation_name = pick("Sci", "Griffa", "Geneti", "Explosi", "Mecha", "Xeno")
if("brown")
jobs_to_revolt = list("Quartermaster", "Cargo Technician", "Shaft Miner")
jobs_to_revolt = GLOB.supply_positions
nation_name = pick("Cargo", "Guna", "Suppli", "Mule", "Crate", "Ore", "Mini", "Shaf")
if("whatevercolorrepresentstheservicepeople") //the few, the proud, the technically aligned
jobs_to_revolt = list("Bartender", "Cook", "Botanist", "Clown", "Mime", "Janitor", "Chaplain")
jobs_to_revolt = GLOB.service_positions.Copy() - list("Assistant", "Prisoner")
nation_name = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi")
nation_name += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotzka")