From a1116f6dc8417db08b01d3ed354a7a568d30876c Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Mon, 12 Feb 2018 01:52:33 +0000 Subject: [PATCH 1/6] QM is now a Head of Staff, everyone rejoice --- .../items/devices/radio/encryptionkey.dm | 2 ++ .../objects/items/devices/radio/headset.dm | 2 ++ .../crates_lockers/closets/secure/cargo.dm | 2 +- code/modules/jobs/jobs.dm | 7 ++--- .../game/gamemodes/revolution/revolution.dm | 2 ++ .../code/game/machinery/computer/card.dm | 3 +++ .../items/devices/radio/encryptionkey.dm | 12 +++++++++ .../objects/items/devices/radio/headset.dm | 12 +++++++++ .../crates_lockers/closets/secure/cargo.dm | 5 ++++ .../code/modules/jobs/job_types/captain.dm | 17 ++++++++++++ .../modules/jobs/job_types/cargo_service.dm | 27 +++++++++++++++++++ modular_citadel/code/modules/jobs/jobs.dm | 15 +++++++++++ tgstation.dme | 8 ++++++ 13 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 modular_citadel/code/game/gamemodes/revolution/revolution.dm create mode 100644 modular_citadel/code/game/machinery/computer/card.dm create mode 100644 modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm create mode 100644 modular_citadel/code/game/objects/items/devices/radio/headset.dm create mode 100644 modular_citadel/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm create mode 100644 modular_citadel/code/modules/jobs/job_types/captain.dm create mode 100644 modular_citadel/code/modules/jobs/job_types/cargo_service.dm create mode 100644 modular_citadel/code/modules/jobs/jobs.dm diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 2d3d869676..0251e6852f 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -94,11 +94,13 @@ icon_state = "cmo_cypherkey" channels = list("Medical" = 1, "Command" = 1) +/*CITADEL CHANGE - comments this out to be overridden in modular_citadel /obj/item/device/encryptionkey/heads/hop name = "\proper the head of personnel's encryption key" desc = "An encryption key for a radio headset. Channels are as follows: :u - supply, :v - service, :c - command." icon_state = "hop_cypherkey" channels = list("Supply" = 1, "Service" = 1, "Command" = 1) +*/ /obj/item/device/encryptionkey/headset_cargo name = "supply radio encryption key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 1362721e1d..823b932e89 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -163,11 +163,13 @@ icon_state = "com_headset" keyslot = new /obj/item/device/encryptionkey/heads/cmo +/*CITADEL CHANGE - comments this out to be overridden in modular_citadel /obj/item/device/radio/headset/heads/hop name = "\proper the head of personnel's headset" desc = "The headset of the guy who will one day be captain.\nChannels are as follows: :u - supply, :v - service, :c - command." icon_state = "com_headset" keyslot = new /obj/item/device/encryptionkey/heads/hop +*/ /obj/item/device/radio/headset/headset_cargo name = "supply radio headset" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 3f54a3dec2..eff0db0af5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -9,7 +9,7 @@ new /obj/item/storage/lockbox/medal/cargo(src) new /obj/item/clothing/under/rank/cargo(src) new /obj/item/clothing/shoes/sneakers/brown(src) - new /obj/item/device/radio/headset/headset_cargo(src) +// new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/clothing/gloves/fingerless(src) new /obj/item/device/megaphone/cargo(src) diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 54a5b402db..55fbec0c58 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -1,3 +1,4 @@ +/*CITADEL CHANGE - comments this out to be overridden in modular_citadel GLOBAL_LIST_INIT(command_positions, list( "Captain", "Head of Personnel", @@ -5,7 +6,7 @@ GLOBAL_LIST_INIT(command_positions, list( "Chief Engineer", "Research Director", "Chief Medical Officer")) - +*/ GLOBAL_LIST_INIT(engineering_positions, list( "Chief Engineer", @@ -26,13 +27,13 @@ GLOBAL_LIST_INIT(science_positions, list( "Scientist", "Roboticist")) - +/*CITADEL CHANGE - comments this out to be overridden in modular_citadel GLOBAL_LIST_INIT(supply_positions, list( "Head of Personnel", "Quartermaster", "Cargo Technician", "Shaft Miner")) - +*/ GLOBAL_LIST_INIT(civilian_positions, list( "Bartender", diff --git a/modular_citadel/code/game/gamemodes/revolution/revolution.dm b/modular_citadel/code/game/gamemodes/revolution/revolution.dm new file mode 100644 index 0000000000..b6e6c5adaf --- /dev/null +++ b/modular_citadel/code/game/gamemodes/revolution/revolution.dm @@ -0,0 +1,2 @@ +/datum/game_mode/revolution + restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") \ No newline at end of file diff --git a/modular_citadel/code/game/machinery/computer/card.dm b/modular_citadel/code/game/machinery/computer/card.dm new file mode 100644 index 0000000000..b9dd049d39 --- /dev/null +++ b/modular_citadel/code/game/machinery/computer/card.dm @@ -0,0 +1,3 @@ +/obj/machinery/computer/card + list/blacklisted = list( + "Quartermaster") diff --git a/modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm b/modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm new file mode 100644 index 0000000000..875d32c5b3 --- /dev/null +++ b/modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm @@ -0,0 +1,12 @@ +/obj/item/device/encryptionkey/heads/qm + name = "\proper the quartermaster's encryption key" + desc = "An encryption key for a radio headset. Channels are as follows: :u - supply, :c - command." + icon_state = "hop_cypherkey" + channels = list("Supply" = 1, "Command" = 1) + +/obj/item/device/encryptionkey/heads/hop + name = "\proper the head of personnel's encryption key" + desc = "An encryption key for a radio headset. Channels are as follows: :v - service, :c - command." + icon_state = "hop_cypherkey" + channels = list("Service" = 1, "Command" = 1) + diff --git a/modular_citadel/code/game/objects/items/devices/radio/headset.dm b/modular_citadel/code/game/objects/items/devices/radio/headset.dm new file mode 100644 index 0000000000..279898b54e --- /dev/null +++ b/modular_citadel/code/game/objects/items/devices/radio/headset.dm @@ -0,0 +1,12 @@ +/obj/item/device/radio/headset/heads/qm + name = "\proper the quartermaster's headset" + desc = "The headset of the king (or queen) of paperwork.\nChannels are as follows: :u - supply, :c - command." + icon_state = "com_headset" + keyslot = new /obj/item/device/encryptionkey/heads/qm + +/obj/item/device/radio/headset/heads/hop + name = "\proper the head of personnel's headset" + desc = "The headset of the guy who will one day be captain.\nChannels are as follows: :v - service, :c - command." + icon_state = "com_headset" + keyslot = new /obj/item/device/encryptionkey/heads/hop + diff --git a/modular_citadel/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/modular_citadel/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm new file mode 100644 index 0000000000..7c0e9ef71e --- /dev/null +++ b/modular_citadel/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -0,0 +1,5 @@ +/obj/structure/closet/secure_closet/quartermaster/PopulateContents() + ..() + new /obj/item/device/radio/headset/heads/qm(src) + + diff --git a/modular_citadel/code/modules/jobs/job_types/captain.dm b/modular_citadel/code/modules/jobs/job_types/captain.dm new file mode 100644 index 0000000000..f70b8ca51b --- /dev/null +++ b/modular_citadel/code/modules/jobs/job_types/captain.dm @@ -0,0 +1,17 @@ +/datum/job/hop + + head_announce = list("Supply") + + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM) + diff --git a/modular_citadel/code/modules/jobs/job_types/cargo_service.dm b/modular_citadel/code/modules/jobs/job_types/cargo_service.dm new file mode 100644 index 0000000000..1813503f45 --- /dev/null +++ b/modular_citadel/code/modules/jobs/job_types/cargo_service.dm @@ -0,0 +1,27 @@ +/datum/job/qm + department_head = list("Captain") + supervisors = "the captain" + req_admin_notify = 1 + minimal_player_age = 10 + exp_requirements = 180 + exp_type_department = EXP_TYPE_SUPPLY + + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, ACCESS_HEADS) + minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, ACCESS_HEADS) + +/datum/outfit/job/quartermaster + id = /obj/item/card/id/silver + ears = /obj/item/device/radio/headset/heads/qm + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced = 1) + +/datum/job/cargo_tech + department_head = list("Quartermaster") + supervisors = "the quartermaster" + + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + +/datum/job/mining + department_head = list("Quartermaster") + supervisors = "the quartermaster" + + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) \ No newline at end of file diff --git a/modular_citadel/code/modules/jobs/jobs.dm b/modular_citadel/code/modules/jobs/jobs.dm new file mode 100644 index 0000000000..1e3baa91c3 --- /dev/null +++ b/modular_citadel/code/modules/jobs/jobs.dm @@ -0,0 +1,15 @@ +GLOBAL_LIST_INIT(command_positions, list( + "Captain", + "Head of Personnel", + "Head of Security", + "Chief Engineer", + "Research Director", + "Chief Medical Officer", + "Quartermaster")) + +GLOBAL_LIST_INIT(supply_positions, list( + "Quartermaster", + "Cargo Technician", + "Shaft Miner")) + + diff --git a/tgstation.dme b/tgstation.dme index cf7f7923c3..eb47b55526 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2517,18 +2517,23 @@ #include "modular_citadel\code\datums\uplink_items_cit.dm" #include "modular_citadel\code\datums\mutations\hulk.dm" #include "modular_citadel\code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm" +#include "modular_citadel\code\game\gamemodes\revolution\revolution.dm" #include "modular_citadel\code\game\machinery\Sleeper.dm" +#include "modular_citadel\code\game\machinery\computer\card.dm" #include "modular_citadel\code\game\objects\ids.dm" #include "modular_citadel\code\game\objects\items\handcuffs.dm" #include "modular_citadel\code\game\objects\items\stunsword.dm" #include "modular_citadel\code\game\objects\items\circuitboards\machine_circuitboards.dm" #include "modular_citadel\code\game\objects\items\devices\aicard.dm" #include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm" +#include "modular_citadel\code\game\objects\items\devices\radio\encryptionkey.dm" +#include "modular_citadel\code\game\objects\items\devices\radio\headset.dm" #include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm" #include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm" #include "modular_citadel\code\game\objects\structures\beds_chairs\sofa.dm" #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\fitness.dm" #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\wardrobe.dm" +#include "modular_citadel\code\game\objects\structures\crates_lockers\closets\secure\cargo.dm" #include "modular_citadel\code\modules\admin\admin.dm" #include "modular_citadel\code\modules\admin\holder2.dm" #include "modular_citadel\code\modules\admin\secrets.dm" @@ -2558,6 +2563,9 @@ #include "modular_citadel\code\modules\clothing\under\polychromic_clothes.dm" #include "modular_citadel\code\modules\clothing\under\turtlenecks.dm" #include "modular_citadel\code\modules\crafting\recipes.dm" +#include "modular_citadel\code\modules\jobs\jobs.dm" +#include "modular_citadel\code\modules\jobs\job_types\captain.dm" +#include "modular_citadel\code\modules\jobs\job_types\cargo_service.dm" #include "modular_citadel\code\modules\mentor\follow.dm" #include "modular_citadel\code\modules\mentor\mentor.dm" #include "modular_citadel\code\modules\mentor\mentor_memo.dm" From 84b637b405cd5cd0ecf666d9a2ca9de686007a2f Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Mon, 12 Feb 2018 02:35:17 +0000 Subject: [PATCH 2/6] Requested changes done --- code/game/objects/items/devices/radio/encryptionkey.dm | 2 -- code/game/objects/items/devices/radio/headset.dm | 2 -- .../code/game/objects/items/devices/radio/encryptionkey.dm | 2 -- .../code/game/objects/items/devices/radio/headset.dm | 2 -- 4 files changed, 8 deletions(-) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 0251e6852f..2d3d869676 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -94,13 +94,11 @@ icon_state = "cmo_cypherkey" channels = list("Medical" = 1, "Command" = 1) -/*CITADEL CHANGE - comments this out to be overridden in modular_citadel /obj/item/device/encryptionkey/heads/hop name = "\proper the head of personnel's encryption key" desc = "An encryption key for a radio headset. Channels are as follows: :u - supply, :v - service, :c - command." icon_state = "hop_cypherkey" channels = list("Supply" = 1, "Service" = 1, "Command" = 1) -*/ /obj/item/device/encryptionkey/headset_cargo name = "supply radio encryption key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 823b932e89..1362721e1d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -163,13 +163,11 @@ icon_state = "com_headset" keyslot = new /obj/item/device/encryptionkey/heads/cmo -/*CITADEL CHANGE - comments this out to be overridden in modular_citadel /obj/item/device/radio/headset/heads/hop name = "\proper the head of personnel's headset" desc = "The headset of the guy who will one day be captain.\nChannels are as follows: :u - supply, :v - service, :c - command." icon_state = "com_headset" keyslot = new /obj/item/device/encryptionkey/heads/hop -*/ /obj/item/device/radio/headset/headset_cargo name = "supply radio headset" diff --git a/modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm b/modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm index 875d32c5b3..840883e450 100644 --- a/modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm @@ -5,8 +5,6 @@ channels = list("Supply" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/hop - name = "\proper the head of personnel's encryption key" desc = "An encryption key for a radio headset. Channels are as follows: :v - service, :c - command." - icon_state = "hop_cypherkey" channels = list("Service" = 1, "Command" = 1) diff --git a/modular_citadel/code/game/objects/items/devices/radio/headset.dm b/modular_citadel/code/game/objects/items/devices/radio/headset.dm index 279898b54e..874e6f8301 100644 --- a/modular_citadel/code/game/objects/items/devices/radio/headset.dm +++ b/modular_citadel/code/game/objects/items/devices/radio/headset.dm @@ -5,8 +5,6 @@ keyslot = new /obj/item/device/encryptionkey/heads/qm /obj/item/device/radio/headset/heads/hop - name = "\proper the head of personnel's headset" desc = "The headset of the guy who will one day be captain.\nChannels are as follows: :v - service, :c - command." - icon_state = "com_headset" keyslot = new /obj/item/device/encryptionkey/heads/hop From 4d7e9caa523a85090d6f04b4743407a5e04606ab Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Mon, 12 Feb 2018 03:03:35 +0000 Subject: [PATCH 3/6] Goofed on the HoP's arrival announcement channel --- modular_citadel/code/modules/jobs/job_types/captain.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/jobs/job_types/captain.dm b/modular_citadel/code/modules/jobs/job_types/captain.dm index f70b8ca51b..224d3e0c7f 100644 --- a/modular_citadel/code/modules/jobs/job_types/captain.dm +++ b/modular_citadel/code/modules/jobs/job_types/captain.dm @@ -1,6 +1,6 @@ /datum/job/hop - head_announce = list("Supply") + head_announce = list("Service") access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, From 9c3c039dc1a45e359a47e2329469d691048b9337 Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Thu, 15 Feb 2018 10:15:02 +0000 Subject: [PATCH 4/6] Commenting out civilian job global init --- code/modules/jobs/jobs.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 55fbec0c58..f3b3237834 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(supply_positions, list( "Cargo Technician", "Shaft Miner")) */ - +/*CITADEL CHANGE - comments this out to be overridden in modular_citadel GLOBAL_LIST_INIT(civilian_positions, list( "Bartender", "Botanist", @@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(civilian_positions, list( "Clown", "Mime", "Assistant")) - +*/ GLOBAL_LIST_INIT(security_positions, list( "Head of Security", @@ -127,4 +127,4 @@ GLOBAL_PROTECT(exp_specialmap) job = mine_expand.Replace(job, "shaft miner") job = chef_expand.Replace(job, "cook") job = borg_expand.Replace(job, "cyborg") - return job \ No newline at end of file + return job From cfe11488b6febfccf20672a37a732b18611b1866 Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Thu, 15 Feb 2018 10:15:34 +0000 Subject: [PATCH 5/6] Re-adds HoP to the Civilian joblist Should make them able to be chosen as a job again --- modular_citadel/code/modules/jobs/jobs.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modular_citadel/code/modules/jobs/jobs.dm b/modular_citadel/code/modules/jobs/jobs.dm index 1e3baa91c3..85e8043d62 100644 --- a/modular_citadel/code/modules/jobs/jobs.dm +++ b/modular_citadel/code/modules/jobs/jobs.dm @@ -11,5 +11,18 @@ GLOBAL_LIST_INIT(supply_positions, list( "Quartermaster", "Cargo Technician", "Shaft Miner")) + +GLOBAL_LIST_INIT(civilian_positions, list( + "Head of Personnel", + "Bartender", + "Botanist", + "Cook", + "Janitor", + "Curator", + "Lawyer", + "Chaplain", + "Clown", + "Mime", + "Assistant")) From 39f84767f1984f4eba0a8048f192398094c4b6bb Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Fri, 16 Feb 2018 17:55:25 +0000 Subject: [PATCH 6/6] Updates sillytips.txt to make sense --- strings/sillytips.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/sillytips.txt b/strings/sillytips.txt index df6366abdb..79dd683ccd 100644 --- a/strings/sillytips.txt +++ b/strings/sillytips.txt @@ -14,7 +14,7 @@ The wizard is supposed to be extremely strong in one on one combat, stop getting Sometimes a round will just be a bust. C'est la vie. This is a game that is constantly being developed for. Expect things to be added, removed, fixed, and broken on a daily basis. It's fun to try and predict the round type from the tip of the round message. -The quartermaster is not a head of staff and will never be one. +They said the QM could never be a head, but we showed them. The bird remembers. Your sprite represents your hitbox, so that afro makes you easier to kill. The sacrifices we make for style. Sometimes admins will just do stuff. Roll with it.