From 107e3c19178f3faa004ed6d13307a3845c9ecb85 Mon Sep 17 00:00:00 2001 From: Cody Brittain Date: Thu, 26 Oct 2023 13:41:31 -0400 Subject: [PATCH] Replace all mentions of Gorlex Marauders with Hammertail Smiths (#17644) * Replace all mentions of Gorlex Marauders with Hammertail Smiths * CL --------- Co-authored-by: Cody Brittain --- code/modules/clothing/spacesuits/void/merc.dm | 4 +- code/modules/economy/Events.dm | 2 +- .../GeneralCamo - Hammertail Smiths.yml | 41 +++++++++++++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/GeneralCamo - Hammertail Smiths.yml diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index f0d35a1ee35..4c966c2e554 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -1,7 +1,7 @@ //Syndicate rig /obj/item/clothing/head/helmet/space/void/merc name = "blood-red voidsuit helmet" - desc = "An advanced helmet designed for work in special operations. Property of Gorlex Marauders." + desc = "An advanced helmet designed for work in special operations. Property of Hammertail Smiths." icon_state = "rig0-syndie" item_state = "syndie_helm" item_state_slots = list( @@ -26,7 +26,7 @@ /obj/item/clothing/suit/space/void/merc name = "blood-red voidsuit" - desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders." + desc = "An advanced suit that protects against injuries during special operations. Property of Hammertail Smiths." icon_state = "rig-syndie" item_state = "rig-syndie" item_state_slots = list( diff --git a/code/modules/economy/Events.dm b/code/modules/economy/Events.dm index 04005b35b27..9d50c06c37c 100644 --- a/code/modules/economy/Events.dm +++ b/code/modules/economy/Events.dm @@ -70,7 +70,7 @@ if(PIRATES) body = "[pick("Pirates","Criminal elements","A [pick("mercenary","Donk Co.","Waffle Co.","\'REDACTED\'")] strike force")] have [pick("raided","blockaded","attempted to blackmail","attacked")] [affected_dest.name] today. Security has been tightened, but many valuable minerals were taken." if(CORPORATE_ATTACK) - body = "A small [pick("pirate","Cybersun Industries","Gorlex Marauders","mercenary")] fleet has precise-jumped into proximity with [affected_dest.name], [pick("for a smash-and-grab operation","in a hit and run attack","in an overt display of hostilities")]. Much damage was done, and security has been tightened since the incident." + body = "A small [pick("pirate","Cybersun Industries","Hammertail Smiths","mercenary")] fleet has precise-jumped into proximity with [affected_dest.name], [pick("for a smash-and-grab operation","in a hit and run attack","in an overt display of hostilities")]. Much damage was done, and security has been tightened since the incident." if(ALIEN_RAIDERS) if(prob(20)) body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. [current_map.company_name] authorities are standing by to counter attempts at bio-terrorism." diff --git a/html/changelogs/GeneralCamo - Hammertail Smiths.yml b/html/changelogs/GeneralCamo - Hammertail Smiths.yml new file mode 100644 index 00000000000..78da59daa38 --- /dev/null +++ b/html/changelogs/GeneralCamo - Hammertail Smiths.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: GeneralCamo + +# 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: + - tweak: "Replace all mentions of Gorlex Marauders with Hammertail Smiths."