From 055ac130af8911e598489e7e628b229b28c56089 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Fri, 11 Oct 2024 16:08:39 -0500 Subject: [PATCH 1/2] lol --- code/controllers/subsystem/nightcycle.dm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/controllers/subsystem/nightcycle.dm b/code/controllers/subsystem/nightcycle.dm index f1c578d1233..91df7daef3f 100644 --- a/code/controllers/subsystem/nightcycle.dm +++ b/code/controllers/subsystem/nightcycle.dm @@ -30,28 +30,28 @@ SUBSYSTEM_DEF(nightcycle) wait = 10 SECONDS // Control vars var/current_time = DAYTIME - var/current_sun_color = "#FFFFFF" - var/current_sun_power = 230 + var/current_sun_color = "#bf9292" + var/current_sun_power = 40 // Variables for badmining var/sunrise_sun_color = "#6a5649" - var/sunrise_sun_power = 65 + var/sunrise_sun_power = 35 var/morning_sun_color = "#825415" - var/morning_sun_power = 115 + var/morning_sun_power = 55 var/latemorn_sun_color = "#835617" - var/latemorn_sun_power = 155 + var/latemorn_sun_power = 75 var/daytime_sun_color = "#959376" - var/daytime_sun_power = 185 + var/daytime_sun_power = 90 var/afternoon_sun_color = "#787665" - var/afternoon_sun_power = 165 + var/afternoon_sun_power = 80 var/lateafternoon_sun_color = "#646353" - var/lateafternoon_sun_power = 145 + var/lateafternoon_sun_power = 75 var/sunset_sun_color = "#6a4c21" - var/sunset_sun_power = 105 + var/sunset_sun_power = 52 var/fullsunset_sun_color = "#863d48" - var/fullsunset_sun_power = 55 + var/fullsunset_sun_power = 22 var/nighttime_sun_color = "#4e5058" - var/nighttime_sun_power = 1 // dark as shit brooo + var/nighttime_sun_power = 0 // dark as shit brooo /// If defined with any number besides null it will determine how long each cycle lasts. // var/custom_cycle_wait = 1600 SECONDS From 77a931ffdee057231f36c8c442b41a18a75f79c4 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Fri, 11 Oct 2024 16:36:28 -0500 Subject: [PATCH 2/2] Mostly purges references to new boston Replaced with 'town' or, 'the town'. --- arfsuits.dm | 4 +- code/__DEFINES/preferences.dm | 2 +- code/__DEFINES/radio.dm | 2 +- code/controllers/subsystem/economy.dm | 2 +- code/controllers/subsystem/ticker.dm | 4 +- .../machinery/porta_turret/portable_turret.dm | 12 ++--- code/game/objects/effects/landmarks.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 12 ++--- .../objects/items/devices/radio/headset.dm | 44 +++++++++---------- code/game/objects/items/storage/briefcase.dm | 2 +- code/modules/WVM/wmv_buyer.dm | 2 +- code/modules/clothing/head/f13factionhead.dm | 2 +- code/modules/jobs/job_types/jobs_we_use.dm | 28 ++++++------ code/modules/jobs/jobs.dm | 2 +- code/modules/surgery/surgery.dm | 2 +- 15 files changed, 61 insertions(+), 61 deletions(-) diff --git a/arfsuits.dm b/arfsuits.dm index 5da0edbcfd4..53e8cefb42d 100644 --- a/arfsuits.dm +++ b/arfsuits.dm @@ -3326,7 +3326,7 @@ item_state = "vest_follower" /obj/item/clothing/suit/armor/medium/vest/town - name = "New Boston flak vest" + name = "dusty flak vest" desc = "A refurbished flak vest, repaired by the Nash Police Department. The ballistic nylon has a much tougher weave, but it still will not take acid or most high-powered rounds." icon = 'icons/fallout/clothing/armored_light.dmi' mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi' @@ -3476,7 +3476,7 @@ armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/vest/breastplate/oasis - name = "New Boston steel breastplate" + name = "dusty steel breastplate" desc = "a steel breastplate, inspired by a Pre-Fall design. Looks like Nash citizens added an additional layer of metal on the front face." icon = 'icons/fallout/clothing/armored_medium.dmi' mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 2652f0ae991..2199ed75533 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -94,7 +94,7 @@ #define EXP_TYPE_SCRIBE "Scribe" #define EXP_TYPE_DECANUS "Decanus" #define EXP_TYPE_TRIBAL "Tribal" -#define EXP_TYPE_FOLLOWERS "New Boston Clinic" +#define EXP_TYPE_FOLLOWERS "Town Clinic" #define EXP_TYPE_OUTLAW "Redwater Townie" #define EXP_TYPE_KHAN "Great Khans" #define EXP_TYPE_CLUB "Heavens Night" diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index b8d83fac92d..894919bf3ba 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -69,7 +69,7 @@ #define RADIO_KEY_ENCLAVE "z" #define RADIO_TOKEN_ENCLAVE ":z" -#define RADIO_CHANNEL_TOWN "New Boston" +#define RADIO_CHANNEL_TOWN "Town" #define RADIO_KEY_TOWN "f" #define RADIO_TOKEN_TOWN ":f" diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm index ccf1825adfc..f7798105af6 100644 --- a/code/controllers/subsystem/economy.dm +++ b/code/controllers/subsystem/economy.dm @@ -222,7 +222,7 @@ SUBSYSTEM_DEF(economy) "be used to fund a use for all these corpses you've all been sending us", "go towards putting out the River of Flame", "pay to put food on your family", - "help fund moving New Boston 20 meters to the left", + "help fund moving all the trees 20 meters to the left", "go towards putting up wallpaper in the Portal Shelters", "be put in the Rainy Day fund", "help fund the Bras for Broken Backs charity", diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index d7db4dbbc3b..a54d7430e3f 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -581,7 +581,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/send_news_report() var/news_message - var/news_source = "New Boston Publishing" + var/news_source = "Wasteland Publishing" switch(news_report) if(NUKE_SYNDICATE_BASE) news_message = "In a daring raid, the heroic crew of [station_name()] detonated a nuclear device in the heart of a terrorist base." @@ -629,7 +629,7 @@ SUBSYSTEM_DEF(ticker) if(SSblackbox.first_death) var/list/ded = SSblackbox.first_death //fortuna addition. list of random names for the roundend news investigator - var/list/investigator = list("New Boston Investigators","A band of couriers","Patrolling wasters","A few mysterious strangers") + var/list/investigator = list("Wasteland Investigators","A band of couriers","Patrolling wasters","A few mysterious strangers") if(ded.len) news_message += "[pick(investigator)] discovered the corpse of a person of interest in the area. Their name was: [ded["name"]], the [ded["role"]], who died in a nearby [ded["area"]].[ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""]" else diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 0c15bd8bbe4..cf74656c99f 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -1846,7 +1846,7 @@ icon = 'icons/obj/turrets.dmi' icon_state = "syndie_off" base_icon_state = "syndie" - desc = "A friendly turret here to keep New Boston (or wherever it currenly is) nice and safe! Fires a burst of 9mm bullets \ + desc = "A friendly turret here to keep everyone (or wherever it currenly is) nice and safe! Fires a burst of 9mm bullets \ at any wasteland annoyances that come too close. Its targetting sensors purposefully ignore friendly targets, like you! \

\ Don't worry! This thing is ON YOUR SIDE! Seriously, this thing is so fervently aligned with you that it may as well be \ @@ -1881,7 +1881,7 @@ icon = 'icons/obj/turrets.dmi' icon_state = "syndie_off" base_icon_state = "syndie" - desc = "A friendly turret here to keep New Boston (or wherever it currenly is) nice and safe! Fires a burst of 5.56mm shells \ + desc = "A friendly turret here to keep everyone (or wherever it currenly is) nice and safe! Fires a burst of 5.56mm shells \ at any wasteland annoyances that come too close. Its targetting sensors purposefully ignore friendly targets, like you! \

\ Don't worry! This thing is ON YOUR SIDE! Seriously, this thing is so fervently aligned with you that it may as well be \ @@ -1899,7 +1899,7 @@ icon = 'icons/obj/turrets.dmi' icon_state = "syndie_off" base_icon_state = "syndie" - desc = "A friendly turret here to keep New Boston (or wherever it currenly is) nice and safe! Fires a spray of buckshot \ + desc = "A friendly turret here to keep everyone (or wherever it currenly is) nice and safe! Fires a spray of buckshot \ at any wasteland annoyances that come too close. Its targetting sensors purposefully ignore friendly targets, like you! \

\ Don't worry! This thing is ON YOUR SIDE! Seriously, this thing is so fervently aligned with you that it may as well be \ @@ -1916,7 +1916,7 @@ icon = 'icons/obj/turrets.dmi' icon_state = "syndie_off" base_icon_state = "syndie" - desc = "A friendly turret here to keep New Boston (or wherever it currenly is) nice and safe! Fires a big fat .50 BMG round \ + desc = "A friendly turret here to keep everyone (or wherever it currenly is) nice and safe! Fires a big fat .50 BMG round \ at any wasteland annoyances that come too close. Its targetting sensors purposefully ignore friendly targets, like you! \

\ Don't worry! This thing is ON YOUR SIDE! Seriously, this thing is so fervently aligned with you that it may as well be \ @@ -1935,7 +1935,7 @@ icon = 'icons/obj/turrets.dmi' icon_state = "syndie_off" base_icon_state = "syndie" - desc = "A friendly turret here to keep New Boston (or wherever it currenly is) nice and safe! Will blast its frickin railgun \ + desc = "A friendly turret here to keep everyone (or wherever it currenly is) nice and safe! Will blast its frickin railgun \ at any wasteland annoyances that come too close. Its targetting sensors purposefully ignore friendly targets, like you! \

\ Don't worry! This thing is ON YOUR SIDE! Seriously, this thing is so fervently aligned with you that it may as well be \ @@ -1954,7 +1954,7 @@ icon = 'icons/obj/turrets.dmi' icon_state = "syndie_off" base_icon_state = "syndie" - desc = "A friendly turret here to keep New Boston (or wherever it currenly is) nice and safe! Fires a spray of lasers \ + desc = "A friendly turret here to keep everyone (or wherever it currenly is) nice and safe! Fires a spray of lasers \ at any wasteland annoyances that come too close. Its targetting sensors purposefully ignore friendly targets, like you! \

\ Don't worry! This thing is ON YOUR SIDE! Seriously, this thing is so fervently aligned with you that it may as well be \ diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 1fa740a4cb8..c41b341ad5b 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -1144,7 +1144,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "Medical Doctor" /obj/effect/landmark/start/f13/followersguard - name = "New Boston Paramedic" + name = "Town Paramedic" icon_state = "Security Officer" /obj/effect/landmark/start/f13/followersvolunteer diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index dc7b66ac153..9fc49c6353f 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -178,14 +178,14 @@ channels = list(RADIO_CHANNEL_ENCLAVE = 1) /obj/item/encryptionkey/headset_town - name = "New Boston radio encryption key" + name = "town radio encryption key" desc = "An encryption key for a radio headset.\ \nTo access the Nash channel, use :f." icon_state = "cypherkey" channels = list(RADIO_CHANNEL_TOWN = 1) /obj/item/encryptionkey/headset_town/lawman - name = "New Boston Sheriff radio encryption key" + name = "town Sheriff radio encryption key" desc = "An encryption key for a radio headset.\ \nTo access the Nash channel, use :f.\ \nTo access the Nash sheriff channel, use :l" @@ -193,7 +193,7 @@ channels = list(RADIO_CHANNEL_TOWN = 1, RADIO_CHANNEL_TOWN_PD = 1) /obj/item/encryptionkey/headset_town/commerce - name = "New Boston commercial radio encryption key" + name = "town commercial radio encryption key" desc = "An encryption key for a radio headset.\ \nTo access the Nash channel, use :f.\ \nTo access the Nash commerce channel, use :j" @@ -201,7 +201,7 @@ channels = list(RADIO_CHANNEL_TOWN = 1, RADIO_CHANNEL_TOWN_COMMERCE = 1) /obj/item/encryptionkey/headset_town/guild - name = "New Boston guild encryption key" + name = "town guild encryption key" desc = "An encryption key for a radio headset.\ \nTo access the Nash channel, use :f.\ \nTo access the Nash guild channel, use :g" @@ -209,7 +209,7 @@ channels = list(RADIO_CHANNEL_TOWN = 1, RADIO_CHANNEL_GUILD = 1) /obj/item/encryptionkey/headset_town/medical - name = "New Boston medical radio encryption key" + name = "town medical radio encryption key" desc = "An encryption key for a radio headset.\ \nTo access the Nash channel, use :f.\ \nTo access the Nash medical channel, use :m" @@ -217,7 +217,7 @@ channels = list(RADIO_CHANNEL_TOWN = 1, RADIO_CHANNEL_MEDICAL = 1) /obj/item/encryptionkey/headset_town/mayor - name = "New Boston mayor radio encryption key" + name = "town mayor radio encryption key" desc = "An encryption key for a radio headset.\ \nTo access the Nash channel, use :f.\ \nTo access the Nash mayor, use :y.\ diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index dcd3015b035..40ee92b8c84 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -409,7 +409,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/headset_town/guild name = "guild radio headset" - desc = "This is used by the residents of the new boston guild.\nTo access the guild channel, use :g as in guild or f to talk in new boston channel." + desc = "This is used by the residents of the towns guild.\nTo access the guild channel, use :g as in guild or f to talk in town channel." icon_state = "mine_headset" item_state = "headset_alt" keyslot = new /obj/item/encryptionkey/headset_town/guild @@ -422,45 +422,45 @@ GLOBAL_LIST_INIT(channel_tokens, list( keyslot = new /obj/item/encryptionkey/headset_biker /obj/item/radio/headset/headset_town - name = "New Boston radio headset" - desc = "This is used by the town of New Boston.\ - \nTo access the New Boston channel, use :f." + name = "town radio headset" + desc = "This is used by the town of town.\ + \nTo access the town channel, use :f." icon_state = "mine_headset" keyslot = new /obj/item/encryptionkey/headset_town /obj/item/radio/headset/headset_town/lawman - name = "New Boston sheriff radio headset" - desc = "This is used by New Boston's local sheriff force. Protects ears from flashbangs.\ - \nTo access the New Boston channel, use :f.\ - \nTo access the New Boston sheriff channel, use :l." + name = "town sheriff radio headset" + desc = "This is used by town's local sheriff force. Protects ears from flashbangs.\ + \nTo access the town channel, use :f.\ + \nTo access the town sheriff channel, use :l." icon_state = "sec_headset_alt" item_state = "sec_headset_alt" bowman = TRUE keyslot = new /obj/item/encryptionkey/headset_town/lawman /obj/item/radio/headset/headset_town/commerce - name = "New Boston commerce radio headset" - desc = "This is used by New Boston's small business owners.\ - \nTo access the New Boston channel, use :f.\ - \nTo access the New Boston commerce channel, use :j." + name = "town commerce radio headset" + desc = "This is used by town's small business owners.\ + \nTo access the town channel, use :f.\ + \nTo access the town commerce channel, use :j." keyslot = new /obj/item/encryptionkey/headset_town/commerce /obj/item/radio/headset/headset_town/mayor - name = "New Boston mayoral radio headset" - desc = "This is used by New Boston's mayor (and secretary). Protects ears from flashbangs.\ - \nTo access the New Boston channel, use :f.\ - \nTo access the New Boston mayor channel, use :y.\ - \nTo access the New Boston sheriff channel, use :l.\ - \nTo access the New Boston medical channel, use :m.\ - \nTo access the New Boston commerce channel, use :j." + name = "town mayoral radio headset" + desc = "This is used by town's mayor (and secretary). Protects ears from flashbangs.\ + \nTo access the town channel, use :f.\ + \nTo access the town mayor channel, use :y.\ + \nTo access the town sheriff channel, use :l.\ + \nTo access the town medical channel, use :m.\ + \nTo access the town commerce channel, use :j." bowman = TRUE command = TRUE keyslot = new /obj/item/encryptionkey/headset_town/mayor /obj/item/radio/headset/headset_town/medical - name = "New Boston medical radio headset" - desc = "This is used by New Boston's medical folk.\ - \nTo access the New Boston channel, use :f.\ + name = "town medical radio headset" + desc = "This is used by town's medical folk.\ + \nTo access the town channel, use :f.\ \nTo access the medical channel, use :m" icon_state = "med_headset" keyslot = new /obj/item/encryptionkey/headset_town/medical diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 04fee609d89..eeb8791ccfb 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -72,7 +72,7 @@ new /obj/item/storage/box/funds(src) /obj/item/storage/box/funds - name = "New Boston operating funds" + name = "town operating funds" desc = "A box filled with both local and foreign currency, to cover unexpected purchases" // Secretary spawns with all 3 types of money for negotatiating with any side. ~325 caps worth diff --git a/code/modules/WVM/wmv_buyer.dm b/code/modules/WVM/wmv_buyer.dm index bf9028e52bc..289e86435cb 100644 --- a/code/modules/WVM/wmv_buyer.dm +++ b/code/modules/WVM/wmv_buyer.dm @@ -948,7 +948,7 @@ Fence */ /obj/machinery/mineral/wasteland_trader/bountyticket - name = "New Boston Bounty Ticket Machine" + name = "Bounty Ticket Machine" desc = "This vending machine accepts bounty tickets in exchange for copper. Make the Wasteland safer, and yourself richer, one bullet at a time." buyables_loose = list( diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm index 8196a712553..a275ebffff1 100644 --- a/code/modules/clothing/head/f13factionhead.dm +++ b/code/modules/clothing/head/f13factionhead.dm @@ -814,7 +814,7 @@ AddComponent(/datum/component/armor_plate) /obj/item/clothing/head/f13/town/officer - name = "New Boston officer's cap" + name = "town officer's cap" desc = "A simple dark navy peaked cap, worn by police." icon = 'icons/fallout/clothing/hats.dmi' mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi' diff --git a/code/modules/jobs/job_types/jobs_we_use.dm b/code/modules/jobs/job_types/jobs_we_use.dm index 97913eb3cc2..67a01fdd861 100644 --- a/code/modules/jobs/job_types/jobs_we_use.dm +++ b/code/modules/jobs/job_types/jobs_we_use.dm @@ -80,7 +80,7 @@ //////////////////////////////////////////////////////////////////////////////////////////// /// NEW BOSTON TOWNIES FACTION // -/// The residents of New Boston, here to make a living in this here wasteland, in town // +/// The residents of the town, here to make a living in this here wasteland, in town // //////////////////////////////////////////////////////////////////////////////////////////// /datum/job/townfolk exp_type = EXP_TYPE_OASIS @@ -93,11 +93,11 @@ ////////////////////////////// /// Citizen -/// A basic citizen of New Boston, here to make a living in this here wasteland +/// A basic citizen of town, here to make a living in this here wasteland /datum/job/townfolk/citizen title = "Citizen" flag = F13SETTLER - description = "You are a citizen of New Boston. You have arrived or have been living in the region for purposes known only to you. Try to make a living for yourself - or simply survive - and craft your own unique story." + description = "You are a citizen of the town. You have arrived or have been living in the region for purposes known only to you. Try to make a living for yourself - or simply survive - and craft your own unique story." supervisors = "the Adventurer's Guild" paycheck = COINS_TO_CREDITS(150) // 150 copper per hour access = list(ACCESS_BAR) @@ -110,7 +110,7 @@ /datum/job/townfolk/f13farmer title = "Farmer" flag = F13FARMER - description = "You are a farmer, responsible for the cultivation of crops and the care of livestock. You are the backbone of the settlement, providing food and resources for the community. Your work is essential to the survival of New Boston." + description = "You are a farmer, responsible for the cultivation of crops and the care of livestock. You are the backbone of the settlement, providing food and resources for the community. Your work is essential to the survival of the town." supervisors = "the Adventurer's Guild" loadout_options = list( /datum/outfit/loadout/farmer @@ -125,7 +125,7 @@ /datum/job/townfolk/f13prospector title = "Prospector" flag = F13PROSPECTOR - description = "You are a prospector, responsible for the extraction of valuable resources from the earth. You are the backbone of the settlement, providing raw materials for the community. Your work is essential to the survival of New Boston." + description = "You are a prospector, responsible for the extraction of valuable resources from the earth. You are the backbone of the settlement, providing raw materials for the community. Your work is essential to the survival of the town." supervisors = "the Adventurer's Guild" paycheck = COINS_TO_CREDITS(75) // 75 copper per hour (they get paid in ore) (they can also sell the ore) (there's a lot of ore) exp_requirements = PLAYTIME_HARD_JOB @@ -144,7 +144,7 @@ /datum/job/townfolk/f13barkeep title = "Barkeep" flag = F13BARKEEP - description = "You are a barkeep, responsible for the operation of the local tavern. You are the backbone of the settlement, providing drinks and entertainment for the community. Your work is essential to the survival of New Boston." + description = "You are a barkeep, responsible for the operation of the local tavern. You are the backbone of the settlement, providing drinks and entertainment for the community. Your work is essential to the survival of the town." supervisors = "the Adventurers Guild" outfit = /datum/outfit/job/cb/guild/barkeep exp_requirements = PLAYTIME_HARD_JOB @@ -185,7 +185,7 @@ spawn_positions = 1 exp_requirements = PLAYTIME_HEAD_JOB exp_type = EXP_TYPE_LIVING - description = "You are the manager for the Heaven's Night club, responsible for the operation of the establishment. You are the backbone of the settlement, operating the club that provides such sweet relief to survivors of the wasteland. Your work is essential to the survival of New Boston." + description = "You are the manager for the Heaven's Night club, responsible for the operation of the establishment. You are the backbone of the settlement, operating the club that provides such sweet relief to survivors of the wasteland. Your work is essential to the survival of the town." supervisors = "the Adventurers Guild, sort of" selection_color = "#c94b8a" outfit = /datum/outfit/job/cb/guild/club/manager @@ -202,7 +202,7 @@ head_announce = list("Security") faction = FACTION_CLUB social_faction = FACTION_CLUB - description = "You are a worker at the Heaven's Night club, providing entertainment and relief to the patrons of the establishment. You are the backbone of the settlement, to provide carnal morale to the hardworking townsfolk. Your work is essential to the survival of New Boston." + description = "You are a worker at the Heaven's Night club, providing entertainment and relief to the patrons of the establishment. You are the backbone of the settlement, to provide carnal morale to the hardworking townsfolk. Your work is essential to the survival of the town." supervisors = "the Adventurers Guild, your customers, and the Manager" selection_color = "#df80af" outfit = /datum/outfit/job/cb/guild/club @@ -217,7 +217,7 @@ flag = F13PREACHER total_positions = 3 spawn_positions = 3 - description = "You are a preacher, responsible for the spiritual well-being of the settlement. You are the backbone of the community, providing guidance and comfort to the townsfolk. Your work is essential to the survival of New Boston." + description = "You are a preacher, responsible for the spiritual well-being of the settlement. You are the backbone of the community, providing guidance and comfort to the townsfolk. Your work is essential to the survival of the town." supervisors = "your god, as well as the Adventurers Guild" selection_color = "#dcba97" paycheck = COINS_TO_CREDITS(250) // 250 copper per hour @@ -232,7 +232,7 @@ title = "Librarian" flag = LIBRARIAN selection_color = "#dcba97" - description = "You are the curator of the New Boston Library, responsible for the collection and organization of knowledge. You are the backbone of the settlement, providing access to information and resources for the community. Your work is essential to the survival of New Boston." + description = "You are the curator of the the town Library, responsible for the collection and organization of knowledge. You are the backbone of the settlement, providing access to information and resources for the community. Your work is essential to the survival of the town." supervisors = "the Adventurers Guild" paycheck = COINS_TO_CREDITS(200) // 200 copper per hour outfit = /datum/outfit/job/cb/guild/curator @@ -246,7 +246,7 @@ title = "Banker" flag = F13BANKER selection_color = "#dcba97" - description = "You are the banker of New Boston, responsible for the management of the town's finances. You are the backbone of the settlement, providing financial services and resources for the community. Your work is essential to the survival of New Boston." + description = "You are the banker of the town, responsible for the management of the town's finances. You are the backbone of the settlement, providing financial services and resources for the community. Your work is essential to the survival of the town." supervisors = "the Adventurers Guild" total_positions = 2 spawn_positions = 2 @@ -263,7 +263,7 @@ title = "Shopkeeper" flag = F13SHOPKEEPER selection_color = "#dcba97" - description = "You are a shopkeeper, responsible for the operation of the local store. You are the backbone of the settlement, providing goods and resources for the community. Your work is essential to the survival of New Boston." + description = "You are a shopkeeper, responsible for the operation of the local store. You are the backbone of the settlement, providing goods and resources for the community. Your work is essential to the survival of the town." supervisors = "the Adventurers Guild" total_positions = 2 spawn_positions = 2 @@ -301,7 +301,7 @@ title = "Adventurer" flag = DEP_OASIS selection_color = "#df80af" - description = "You are an adventurer, a resident of New Boston who has taken up the call to explore the wasteland. You are the backbone of the settlement, exploring and risking your own (undying) life to bring back resources and knowledge for the community. Your work is essential to the survival of New Boston." + description = "You are an adventurer, a resident of the town who has taken up the call to explore the wasteland. You are the backbone of the settlement, exploring and risking your own (undying) life to bring back resources and knowledge for the community. Your work is essential to the survival of the town." supervisors = "the Adventurers Guild" exp_requirements = PLAYTIME_HARD_JOB exp_type = EXP_TYPE_LIVING @@ -541,7 +541,7 @@ title = "Dual Citizen" flag = F13VILLAGER department_flag = TRIBAL | DEP_OASIS - supervisors = "New Boston's laws and all tribe members aside from other villagers" + supervisors = "the town's laws and all tribe members aside from other villagers" description = "A proud member of the Mountain River tribe, you do what needs to be done to ensure the survival of yourself and your people while following the laws of the tribe. While it is common to venture out into the wasteland, do not tread far or without informing your kin. You are also a citizen living in Nash. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace. One of the local businesses may have work if you require funds." outfit = /datum/outfit/job/den/f13dualcitizen access = list(ACCESS_TRIBE, ACCESS_BAR) diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index ce803f0a840..a9f58a43904 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -397,7 +397,7 @@ GLOBAL_LIST_INIT(position_categories, list( EXP_TYPE_WASTELAND = list("jobs" = wasteland_positions, "color" = "#5a5a5a"), // EXP_TYPE_ENCLAVE = list("jobs" = enclave_positions, "color" = "#323232"), // EXP_TYPE_KHAN = list("jobs" = khan_positions, "color" = "#006666"), - "New Boston" = list("jobs" = oasis_positions, "color" = "#d7b088"), + "Town" = list("jobs" = oasis_positions, "color" = "#d7b088"), //"Den" = list("jobs" = den_positions, "color" = "#d7b088"), "Reclaimers" = list("jobs" = reclaimer_positions, "color" = "#a43dd4"), //"Guild" = list("jobs" = guild_positions, "color" = "#d45b3d"), diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index f2858ae1a93..605c2a59c7f 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -233,7 +233,7 @@ surgeries += beep /obj/item/disk/surgery/oasis - name = "New Boston surgery disk" + name = "town surgery disk" surgeries = list( /datum/surgery/advanced/lobotomy, /datum/surgery/advanced/reconstruction)