diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm
index 0c82fd6787a..0fbdf6ce696 100644
--- a/code/datums/outfits/outfit_antag.dm
+++ b/code/datums/outfits/outfit_antag.dm
@@ -445,7 +445,6 @@
/obj/item/gun/projectile/silenced,
/obj/item/gun/projectile/colt,
/obj/item/gun/projectile/colt/super,
- /obj/item/gun/projectile/revolver/deckard,
/obj/item/gun/projectile/revolver/lemat
)
diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm
index 52d7fa0a1d4..0f83c75370e 100644
--- a/code/datums/trading/misc.dm
+++ b/code/datums/trading/misc.dm
@@ -138,7 +138,6 @@
/obj/item/clothing/glasses/monocle = TRADER_THIS_TYPE,
/obj/item/clothing/mask/smokable/pipe = TRADER_THIS_TYPE,
/obj/item/clothing/mask/gas/plaguedoctor = TRADER_THIS_TYPE,
- /obj/item/clothing/suit/imperium_monk = TRADER_THIS_TYPE,
/obj/item/clothing/suit/judgerobe = TRADER_THIS_TYPE,
/obj/item/clothing/suit/wizrobe/magusred = TRADER_THIS_TYPE,
/obj/item/clothing/suit/wizrobe/magusblue = TRADER_THIS_TYPE,
diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm
index c9ceb895e6e..a38646f57ec 100644
--- a/code/datums/trading/weaponry.dm
+++ b/code/datums/trading/weaponry.dm
@@ -25,7 +25,6 @@
/obj/item/gun/projectile/shotgun/doublebarrel = TRADER_ALL,
/obj/item/gun/projectile/tanto = TRADER_THIS_TYPE,
/obj/item/gun/projectile/revolver/detective = TRADER_THIS_TYPE,
- /obj/item/gun/projectile/revolver/deckard = TRADER_THIS_TYPE,
/obj/item/gun/projectile/leyon = TRADER_THIS_TYPE,
/obj/item/gun/projectile/automatic/x9 = TRADER_THIS_TYPE,
/obj/item/gun/projectile/automatic/rifle/carbine = TRADER_THIS_TYPE,
diff --git a/code/game/objects/effects/decals/posters/bs12.dm b/code/game/objects/effects/decals/posters/bs12.dm
index 712b5a36104..1fc20e6cf8c 100644
--- a/code/game/objects/effects/decals/posters/bs12.dm
+++ b/code/game/objects/effects/decals/posters/bs12.dm
@@ -4,36 +4,6 @@
name = "Unlucky Space Explorer"
desc = "This particular one depicts a skeletal form within a space suit."
-/datum/poster/bay_2
- icon_state="bsposter2"
- name = "Positronic Logic Conflicts"
- desc = "This particular one depicts the cold, unmoving stare of a particular advanced AI."
-
-/datum/poster/bay_3
- icon_state="bsposter3"
- name = "Paranoia"
- desc = "This particular one warns of the dangers of trusting your co-workers too much."
-
-/datum/poster/bay_4
- icon_state="bsposter4"
- name = "Keep Calm"
- desc = "This particular one is of a famous New Earth design, although a bit modified. Someone has scribbled an O over the A on the poster."
-
-/datum/poster/bay_5
- icon_state="bsposter5"
- name = "Martian Warlord"
- desc = "This particular one depicts the cartoony mug of a certain Martial Warmonger."
-
-/datum/poster/bay_6
- icon_state="bsposter6"
- name = "Technological Singularity"
- desc = "This particular one is of the blood-curdling symbol of a long-since defeated enemy of humanity."
-
-/datum/poster/bay_7
- icon_state="bsposter7"
- name = "Wasteland"
- desc = "This particular one is of a couple of ragged gunmen, one male and one female, on top of a mound of rubble. The number \"12\" is visible on their blue jumpsuits."
-
/datum/poster/bay_8
icon_state="bsposter8"
name = "Pinup Girl Cindy"
@@ -44,36 +14,6 @@
name = "Pinup Girl Amy"
desc = "This particular one is of Amy, the nymphomaniac urban legend of deep space. How this photograph came to be is not known."
-/datum/poster/bay_10
- icon_state="bsposter10"
- name = "Don't Panic"
- desc = "This particular one depicts some sort of star in a grimace. The \"Don't Panic\" is written in big, friendly letters."
-
-/datum/poster/bay_11
- icon_state="bsposter11"
- name = "Underwater Laboratory"
- desc = "This particular one is of the fabled last crew of a previous Company project."
-
-/datum/poster/bay_12
- icon_state="bsposter12"
- name = "Rogue AI"
- desc = "This particular one depicts the shell of the infamous AI that catastropically comandeered one of humanity's earliest space stations. Back then, the Company was just known as TriOptimum."
-
-/datum/poster/bay_13
- icon_state="bsposter13"
- name = "User of the Arcane Arts"
- desc = "This particular one depicts a wizard, casting a spell. You can't really make out if it's an actual photograph or a computer-generated image."
-
-/datum/poster/bay_14
- icon_state="bsposter14"
- name = "Levitating Skull"
- desc = "This particular one is the portrait of a flying enchanted skull. Its adventures along with its fabled companion are now fading through history..."
-
-/datum/poster/bay_15
- icon_state="bsposter15"
- name = "Augmented Legend"
- desc = "This particular one is of an obviously augmented individual, gazing towards the sky. The cyber-city in the backround is rather punkish."
-
/datum/poster/bay_16
icon_state="bsposter16"
name = "Dangerous Static"
@@ -84,11 +24,6 @@
name = "Pinup Girl Val"
desc = "Luscious Val McNeil, the vertically challenged Legal Extraordinaire, winner of Miss Space two years running and favoured pinup girl of Lawyers Weekly."
-/datum/poster/bay_18
- icon_state="bsposter18"
- name = "Derpman, Enforcer of the State"
- desc = "Here to protect and serve... your donuts! A generously proportioned man, he teaches you the value of hiding your snacks."
-
/datum/poster/bay_19
icon_state="bsposter19"
name = "Respect a Unathi"
@@ -117,12 +52,12 @@
/datum/poster/bay_24
icon_state="bsposter24"
name = "Responsible medbay habits, No #259"
- desc = "A poster with a nervous looking geneticist on it states; \"Friends Don't Tell Friends They're Clones. It can cause severe and irreparable emotional trauma. Always do the right thing and never tell them that they were dead.\""
+ desc = "A poster instructing all crew to respect doctor-patient confidentiality."
/datum/poster/bay_25
icon_state="bsposter25"
name = "Irresponsible medbay habits, No #2"
- desc = "This is a safety poster starring a perverted looking naked doctor. \"Sexual harassment is never okay. REPORT any acts of sexual deviance or harassment that disrupt a healthy working environment.\""
+ desc = "This is a safety poster starring a doctor. It instructs the viewer to report all medical misconduct."
/datum/poster/bay_26
icon_state="bsposter26"
@@ -139,11 +74,6 @@
name = "The Stars Know Love"
desc = "This is a movie poster. A bleeding woman is shown drawing a heart in her blood on the window of space ship, it seems to be a romantic Drama."
-/datum/poster/bay_29
- icon_state="bsposter29"
- name = "Winter Is Coming"
- desc = "On the poster is a frighteningly large wolf, he warns: \"Only YOU can keep the station from freezing during planetary occultation!\""
-
/datum/poster/bay_30
icon_state="bsposter30"
name = "Ambrosia Vulgaris"
@@ -151,8 +81,8 @@
/datum/poster/bay_31
icon_state="bsposter31"
- name = "Donut Corp"
- desc = "This is an advertisement for Donut Corp, the new innovation in donut technology!"
+ name = "GetMore Donuts"
+ desc = "This is an advertisement for GetMore's brand of donuts!"
/datum/poster/bay_32
icon_state="bsposter32"
@@ -169,11 +99,6 @@
name = "Power Up!"
desc = "High reward, higher risk!"
-/datum/poster/bay_35
- icon_state="bsposter35"
- name = "Lamarr"
- desc = "This is a poster depicting the pet and mascot of the science department."
-
/datum/poster/bay_36
icon_state="bsposter36"
name = "Fancy Borg"
@@ -224,11 +149,6 @@
name = "Responsible engineering habits, No #1"
desc = "A safety poster featuring a blue haired engineer. \"When repairing a machine or construction, always aim for long-term solutions.\""
-/datum/poster/bay_46
- icon_state="bsposter46"
- name = "Inspirational lawyer"
- desc = "An inspirational poster depicting a Skrellian lawyer. He seems to be shouting something, while pointing fiercely to the right."
-
/datum/poster/bay_47
icon_state="bsposter47"
name = "Security pinup"
@@ -244,15 +164,10 @@
name = "Engineering recruitment"
desc = "This is a poster showing an engineer relaxing by a computer, the text states \"Living the life! Join Engineering today!\""
-/datum/poster/bay_50
- icon_state="bsposter50"
- name = "Pinup Girl Cindy Kate"
- desc = "This particular one is of Cindy Kate, a seductive performer well known among less savoury circles."
-
/datum/poster/bay_51
icon_state="bsposter51"
name = "space appreciation poster"
- desc = "This is a poster produced by the Generic Space Company, as a part of a series of commemorative posters on the wonders of space. One of three."
+ desc = "This is a poster produced as a part of a series of commemorative posters on the wonders of space. One of three."
/datum/poster/bay_52
icon_state="bsposter52"
@@ -272,22 +187,22 @@
/datum/poster/bay_55
icon_state="bsposter55"
name = "Earth appreciation poster"
- desc = "This is a poster produced by the Generic Space Company, as a part of a series of commemorative posters on the wonders of space. Two of three."
+ desc = "This is a poster produced as a part of a series of commemorative posters on the wonders of space. Two of three. Why does it say Terra instead of Earth?"
/datum/poster/bay_56
icon_state="bsposter56"
name = "Mars appreciation poster"
- desc = "This is a poster produced by the Generic Space Company, as a part of a series of commemorative posters on the wonders of space. Three of three."
+ desc = "This is a poster produced as a part of a series of commemorative posters on the wonders of space. Three of three."
/datum/poster/bay_57
icon_state="bsposter57"
name = "space carp warning poster"
- desc = "This poster tells of the dangers of space carp infestations."
+ desc = "This poster tells of the dangers of carp infestations. This one depicts a cartoonish image of a carp, as opposed to a realistic one."
/datum/poster/bay_58
icon_state="bsposter58"
- name = "space bear information poster"
- desc = "This poster displays a picture of a legendary space bear."
+ name = "ursa major poster"
+ desc = "This poster displays a picture of a popular cartoon character."
/datum/poster/bay_60
icon_state = "bsposter60"
@@ -312,17 +227,12 @@
/datum/poster/bay_64
icon_state = "bsposter64"
name = "N.S.S. Exodus"
- desc = "This poster is a picture of the famous N.S.S. Exodus."
+ desc = "This poster is a picture of the N.S.S. Exodus."
/datum/poster/bay_65
icon_state = "bsposter65"
- name = "Importance of Plasma"
- desc = "A corporate morale poster showing three forms of plasma. Teaching the very basics of this really important substance."
-
-/datum/poster/bay_66
- icon_state = "bsposter66"
- name = "BFG 9000"
- desc = "A picture of a big freakin' gun."
+ name = "Importance of Phoron"
+ desc = "A corporate morale poster showing three forms of phoron. Teaching the very basics of this really important substance."
/datum/poster/bay_67
icon_state = "tcflposter"
@@ -332,9 +242,4 @@
/datum/poster/bay_68
icon_state = "tcflposter2"
name = "Tau Ceti Foreign Legion"
- desc = "A TCFL recruitment poster showcasing the benefits Synthetics gain when enlisting."
-
-/datum/poster/bay_69
- icon_state = "grillposter"
- name = "grill"
- desc = "A poster of a smug looking tajaran grilling at a company get-together."
\ No newline at end of file
+ desc = "A TCFL recruitment poster showcasing the benefits Synthetics gain when enlisting."
\ No newline at end of file
diff --git a/code/game/objects/effects/decals/posters/tgposters.dm b/code/game/objects/effects/decals/posters/tgposters.dm
index 5fb94396d52..0c74be7228f 100644
--- a/code/game/objects/effects/decals/posters/tgposters.dm
+++ b/code/game/objects/effects/decals/posters/tgposters.dm
@@ -1,50 +1,16 @@
// /tg/ posters.
-/datum/poster/tg_1
- name = "Free Tonto"
- desc = "A framed shred of a much larger flag, colors bled together and faded from age."
- icon_state="poster1"
-
-/datum/poster/tg_2
- name = "Atmosia Declaration of Independence"
- desc = "A relic of a failed rebellion"
- icon_state="poster2"
-
-/datum/poster/tg_3
- name = "Fun Police"
- desc = "A poster condemning the station's security forces."
- icon_state="poster3"
-
-/datum/poster/tg_4
- name = "Lusty Xeno"
- desc = "A heretical poster depicting the titular star of an equally heretical book."
- icon_state="poster4"
/datum/poster/tg_5
- name = "Mercenary Recruitment Poster"
- desc = "See the galaxy! Shatter corrupt megacorporations! Join today!"
+ name = "PMC Recruitment Poster"
+ desc = "See the galaxy! Earn a living! Join today!"
icon_state="poster5"
-/datum/poster/tg_6
- name = "Clown"
- desc = "Honk."
- icon_state="poster6"
-
/datum/poster/tg_7
name = "Smoke"
- desc = "A poster depicting a carton of cigarettes."
+ desc = "A poster advertising cigarettes."
icon_state="poster7"
-/datum/poster/tg_8
- name = "Grey Tide"
- desc = "A rebellious poster symbolizing assistant solidarity."
- icon_state="poster8"
-
-/datum/poster/tg_9
- name = "Missing Gloves"
- desc = "This poster is about the uproar that followed Nanotrasen's financial cuts towards insulated-glove purchases."
- icon_state="poster9"
-
/datum/poster/tg_10
- name = "Hacking Guide"
- desc = "This poster details the internal workings of the common Nanotrasen airlock."
+ name = "Access Panel Diagram"
+ desc = "This poster details the internal workings of a typical airlock's access panel."
icon_state="poster10"
\ No newline at end of file
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index be30207d902..49baba6ba53 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -176,8 +176,6 @@
new /obj/item/clothing/gloves/white(src.loc)
new /obj/item/clothing/shoes/white(src.loc)
new /obj/item/clothing/under/suit_jacket/white(src.loc)
- if (prob(30))
- new /obj/item/clothing/head/cueball(src.loc)
delete_me = 1
/obj/effect/landmark/costume/highlander/New()
@@ -223,21 +221,10 @@
new /obj/item/clothing/head/ushanka/grey(src.loc)
delete_me = 1
-/obj/effect/landmark/costume/imperium_monk/New()
- new /obj/item/clothing/suit/imperium_monk(src.loc)
- if (prob(25))
- new /obj/item/clothing/mask/gas/cyborg(src.loc)
- delete_me = 1
-
/obj/effect/landmark/costume/holiday_priest/New()
new /obj/item/clothing/suit/holidaypriest(src.loc)
delete_me = 1
-/obj/effect/landmark/costume/marisawizard/fake/New()
- new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
- new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
- delete_me = 1
-
/obj/effect/landmark/costume/cutewitch/New()
new /obj/item/clothing/under/sundress(src.loc)
new /obj/item/clothing/head/witchwig(src.loc)
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 55c94d28f1b..4c1bec100e5 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -777,7 +777,6 @@
/obj/item/clothing/glasses/welding = 0.75,
/obj/item/clothing/head/bearpelt = 0.4,
/obj/item/clothing/head/collectable/petehat = 0.1,
- /obj/item/clothing/head/cueball = 0.25,
/obj/item/clothing/head/hardhat = 1.2,
/obj/item/clothing/head/helmet/augment = 0.1,
/obj/item/clothing/head/pirate = 0.2,
@@ -815,7 +814,6 @@
/obj/item/clothing/shoes/winter = 0.3,
/obj/item/clothing/shoes/workboots = 0.75,
/obj/item/clothing/suit/ianshirt = 0.5,
- /obj/item/clothing/suit/imperium_monk = 0.4,
/obj/item/clothing/suit/storage/hazardvest = 0.75,
/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 0.7,
/obj/item/clothing/suit/storage/vest = 0.2,
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 64ed743a299..43f0675d23d 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -65,9 +65,7 @@
icon_door = "blue"
/obj/structure/closet/lawcloset/fill()
- new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/red(src)
- new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src)
new /obj/item/clothing/under/lawyer/purple(src)
new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 47f538df898..5bc645b0148 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -82,7 +82,6 @@
/obj/structure/closet/secure_closet/xo2/fill()
..()
new /obj/item/clothing/under/rank/xo(src)
- new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
@@ -112,7 +111,6 @@
new /obj/item/clothing/suit/storage/security/hos(src)
new /obj/item/clothing/accessory/badge/hos(src)
new /obj/item/clothing/gloves/black_leather(src)
- new /obj/item/clothing/suit/storage/toggle/armor/hos(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
//Tools
diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm
index 2676fdd3012..15b2d82e2e1 100644
--- a/code/modules/background/citizenship/human.dm
+++ b/code/modules/background/citizenship/human.dm
@@ -35,7 +35,7 @@
/datum/outfit/job/representative/consular/ceti
name = "Tau Ceti Consular Officer"
- uniform = /obj/item/clothing/under/lawyer/blue
+ uniform = /obj/item/clothing/under/suit_jacket/navy
accessory = /obj/item/clothing/accessory/tc_pin
backpack_contents = list(
/obj/item/storage/box/ceti_visa = 1,
diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm
index 813c6fbc034..74cd5f49330 100644
--- a/code/modules/cargo/random_stock/t2_uncommon.dm
+++ b/code/modules/cargo/random_stock/t2_uncommon.dm
@@ -131,10 +131,6 @@ STOCK_ITEM_UNCOMMON(jetpack, 3)
if(prob(40))
new /obj/item/tank/emergency_oxygen/double(L)
-STOCK_ITEM_UNCOMMON(xenocostume, 1)
- new /obj/item/clothing/suit/xenos(L)
- new /obj/item/clothing/head/xenos(L)
-
STOCK_ITEM_UNCOMMON(inhaler, 1)
var/obj/item/reagent_containers/inhaler/I = pick(subtypesof(/obj/item/reagent_containers/inhaler))
new I(L)
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
index 3ea1edb6512..52793a1bb6b 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -79,7 +79,6 @@
var/list/suits = list()
suits["amish suit"] = /obj/item/clothing/under/sl_suit
suits["black suit"] = /obj/item/clothing/under/suit_jacket
- suits["blue suit"] = /obj/item/clothing/under/lawyer/blue
suits["burgundy suit"] = /obj/item/clothing/under/suit_jacket/burgundy
suits["charcoal suit"] = /obj/item/clothing/under/suit_jacket/charcoal
suits["checkered suit"] = /obj/item/clothing/under/suit_jacket/checkered
@@ -88,7 +87,6 @@
suits["purple suit"] = /obj/item/clothing/under/lawyer/purple
suits["red suit"] = /obj/item/clothing/under/suit_jacket/red
suits["red lawyer suit"] = /obj/item/clothing/under/lawyer/red
- suits["shiny black suit"] = /obj/item/clothing/under/lawyer/black
suits["tan suit"] = /obj/item/clothing/under/suit_jacket/tan
suits["white suit"] = /obj/item/clothing/under/suit_jacket/white
suits["nt skirtsuit"] = /obj/item/clothing/under/suit_jacket/nt_skirtsuit
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index adce7d036d6..21545241c52 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -140,14 +140,6 @@
siemens_coefficient = 2.0
body_parts_covered = HEAD|FACE|EYES
-/obj/item/clothing/head/cueball
- name = "cueball helmet"
- desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?"
- icon_state = "cueball"
- item_state = "cueball"
- flags_inv = BLOCKHAIR
- body_parts_covered = HEAD|FACE|EYES
-
/obj/item/clothing/head/cardborg
name = "cardborg helmet"
desc = "A helmet made out of a box."
@@ -179,7 +171,7 @@
/obj/item/clothing/head/rabbitears
name = "rabbit ears"
- desc = "Wearing these makes you looks useless, and only good for your sex appeal."
+ desc = "Wearing these makes you look useless."
icon_state = "bunny"
body_parts_covered = 0
@@ -263,18 +255,6 @@
flags_inv = BLOCKHEADHAIR
siemens_coefficient = 0.7
-/obj/item/clothing/head/xenos
- name = "xenos helmet"
- icon_state = "xenos"
- item_state_slots = list(
- slot_l_hand_str = "xenos_helm",
- slot_r_hand_str = "xenos_helm"
- )
- desc = "A helmet made out of chitinous alien hide."
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
- siemens_coefficient = 2.0
- body_parts_covered = HEAD|FACE|EYES
-
/obj/item/clothing/head/philosopher_wig
name = "natural philosopher's wig"
desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 4e5efb4a19a..eb8da2755ca 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -72,13 +72,6 @@
body_parts_covered = FALSE
sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi')
-/obj/item/clothing/shoes/sandal/marisa
- desc = "A pair of magic, black shoes."
- name = "magic shoes"
- icon_state = "black"
- item_state = "black"
- body_parts_covered = FEET
-
/obj/item/clothing/shoes/sandal/flipflop
name = "flip flops"
desc = "A pair of foam flip flops. For those not afraid to show a little ankle."
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 2de43908bf1..3ddfb08a0eb 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -229,14 +229,6 @@ obj/item/clothing/suit/apron/overalls/blue
//Lawyer
-/obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
- name = "blue suit jacket"
- desc = "A snappy dress jacket."
- icon_state = "suitjacket_blue"
- item_state = "suitjacket_blue"
- blood_overlay_type = "coat"
- body_parts_covered = UPPER_TORSO|ARMS
- opened = TRUE
/obj/item/clothing/suit/storage/lawyer/purpjacket
name = "purple suit jacket"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index eb0cade281a..bcf63370515 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -68,18 +68,9 @@
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
-/obj/item/clothing/suit/imperium_monk
- name = "imperium monk"
- desc = "Have YOU killed a xenos today?"
- icon_state = "imperium_monk"
- item_state = "imperium_monk"
- body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
- flags_inv = HIDESHOES|HIDEJUMPSUIT
-
-
/obj/item/clothing/suit/chickensuit
name = "chicken suit"
- desc = "A suit made long ago by the ancient empire KFC."
+ desc = "A cheap rubber chicken costume."
icon_state = "chickensuit"
item_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
@@ -159,15 +150,6 @@
min_cold_protection_temperature = T0C - 20
siemens_coefficient = 0.75
-/obj/item/clothing/suit/xenos
- name = "xenos suit"
- desc = "A suit made out of chitinous alien hide."
- icon_state = "xenos"
- item_state = "xenos_helm"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- siemens_coefficient = 1.5
-
/obj/item/clothing/suit/golden_tailcoat
name = "golden tailcoat"
desc = "A brilliant looking golden tailcoat of sorts."
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 7e74964d9f1..1a076f14dfe 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -19,11 +19,6 @@
icon_state = "wizard-fake"
body_parts_covered = HEAD|FACE
-/obj/item/clothing/head/wizard/marisa
- name = "witch Hat"
- desc = "Strange-looking hat-wear, makes you want to cast fireballs."
- icon_state = "marisa"
-
/obj/item/clothing/head/wizard/magus
name = "magus Helm"
desc = "A mysterious helmet that hums with an unearthly power"
@@ -67,12 +62,6 @@
icon_state = "redwizard"
item_state = "redwizrobe"
-/obj/item/clothing/suit/wizrobe/marisa
- name = "witch robe"
- desc = "Magic is all about the spell power, ZE!"
- icon_state = "marisa"
- item_state = "marisarobe"
-
/obj/item/clothing/suit/wizrobe/magusblue
name = "magus robe"
desc = "A set of armored robes that seem to radiate a dark power"
@@ -110,18 +99,6 @@
icon_state = "wizard-fake"
item_state = "wizrobe"
-/obj/item/clothing/head/wizard/marisa/fake
- name = "witch hat"
- desc = "Strange-looking hat-wear, makes you want to cast fireballs."
- icon_state = "marisa"
-
-/obj/item/clothing/suit/wizrobe/marisa/fake
- name = "witch robe"
- desc = "Magic is all about the spell power, ZE!"
- icon_state = "marisa"
- item_state = "marisarobe"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
//black robes
/obj/item/clothing/head/wizard/black
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 88d7ce8c512..f34fa66f7f0 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -113,26 +113,14 @@
desc = "Slick threads."
name = "lawyer suit"
-/obj/item/clothing/under/lawyer/black
- name = "black lawyer suit"
- icon_state = "lawyer_black"
- item_state = "lawyer_black"
- worn_state = "lawyer_black"
-
/obj/item/clothing/under/lawyer/red
- name = "red Lawyer suit"
+ name = "garish red suit"
icon_state = "lawyer_red"
item_state = "lawyer_red"
worn_state = "lawyer_red"
-/obj/item/clothing/under/lawyer/blue
- name = "blue Lawyer suit"
- icon_state = "lawyer_blue"
- item_state = "lawyer_blue"
- worn_state = "lawyer_blue"
-
/obj/item/clothing/under/lawyer/purple
- name = "purple suit"
+ name = "garish purple suit"
icon_state = "lawyer_purple"
item_state = "ba_suit"
worn_state = "lawyer_purple"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 7e97ea15118..afd3c2330d4 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -51,7 +51,7 @@
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain.\""
name = "officer's dress uniform"
icon_state = "officer"
- item_state = "lawyer_black"
+ item_state = "bl_suit"
worn_state = "officer"
displays_id = 0
@@ -59,7 +59,7 @@
name = "officer's dress uniform"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral.\""
icon_state = "officer"
- item_state = "lawyer_black"
+ item_state = "bl_suit"
worn_state = "officer"
displays_id = 0
@@ -67,7 +67,7 @@
name = "officer's dress uniform"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral-Executive.\""
icon_state = "centcom"
- item_state = "lawyer_black"
+ item_state = "bl_suit"
worn_state = "centcom"
displays_id = 0
@@ -112,7 +112,7 @@
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Commander.\ It has a patch denoting a Pheonix on the sleeves."
name = "\improper ERT commander's dress uniform"
icon_state = "centcom"
- item_state = "lawyer_black"
+ item_state = "bl_suit"
worn_state = "centcom"
/obj/item/clothing/under/space
diff --git a/code/modules/ghostroles/spawner/human/emergencypod.dm b/code/modules/ghostroles/spawner/human/emergencypod.dm
index 9933b0e4c2d..3e26df34751 100644
--- a/code/modules/ghostroles/spawner/human/emergencypod.dm
+++ b/code/modules/ghostroles/spawner/human/emergencypod.dm
@@ -429,7 +429,6 @@
/obj/item/gun/energy/retro,
/obj/item/gun/projectile/silenced,
/obj/item/gun/projectile/colt,
- /obj/item/gun/projectile/revolver/deckard,
/obj/item/gun/projectile/revolver/lemat
)
diff --git a/code/modules/hallucinations/text_lists/hallucinated_phrases.txt b/code/modules/hallucinations/text_lists/hallucinated_phrases.txt
index 3ceb0f8d847..9bb972bdda6 100644
--- a/code/modules/hallucinations/text_lists/hallucinated_phrases.txt
+++ b/code/modules/hallucinations/text_lists/hallucinated_phrases.txt
@@ -51,9 +51,7 @@ Remember me from high-school? Well I have this great business deal proposition..
Bored?
Once you are a player with MaxBet, you will also receive lucrative weekly and monthly promotions.
Find your secret skrell crush.
-Is your sexlife growing dull? Your late-night sessions growing short? Have you considered Unathi testicle transplants? Greater stamina, greater virility, greater fun.
We know who you are. Expect us.
-Discovery of this ONE Vaurca pheremone has led to years of genital growth progress!
This staff assistant is making mad credits and basically, you're fucking stupid.
You have a secret admirer!
Where's your ID?
diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm
index ce729b7f411..e697b36e8f0 100644
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -228,8 +228,7 @@
..()
recipes += new /datum/stack_recipe_list("[display_name] costumes",
list(
- new /datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos),
- new /datum/stack_recipe("alien suit", /obj/item/clothing/suit/xenos, 3)
+ new /datum/stack_recipe("leather briefcase", /obj/item/storage/briefcase/real, 4, 1, time = 20)
))
/material/hide/corgi/generate_recipes()
diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm
index a7efa0d37dc..fcf5d757166 100644
--- a/code/modules/mob/living/bot/ed209bot.dm
+++ b/code/modules/mob/living/bot/ed209bot.dm
@@ -9,7 +9,7 @@
#define SECBOT_FOLLOW 8 // follows a target
/mob/living/bot/secbot/ed209
- name = "ED-209 Security Robot"
+ name = "Security Assault Robot"
desc = "A security robot. He looks less than thrilled."
icon = 'icons/obj/aibots.dmi'
icon_state = "ed2090"
@@ -285,12 +285,12 @@
// Assembly
/obj/item/secbot_assembly/ed209_assembly
- name = "ED-209 assembly"
+ name = "security assault robot assembly"
desc = "Some sort of bizarre assembly."
icon = 'icons/obj/aibots.dmi'
icon_state = "ed209_frame"
item_state = "ed209_frame"
- created_name = "ED-209 Security Robot"
+ created_name = "Security Assault Robot"
var/lasercolor = ""
/obj/item/secbot_assembly/ed209_assembly/attackby(var/obj/item/W as obj, var/mob/user as mob)
@@ -372,13 +372,13 @@
if(W.use_tool(src, user, 40, volume = 50) && build_step == 6)
if(C.use(1))
build_step++
- to_chat(user, "You wire the ED-209 assembly.")
- name = "wired ED-209 assembly"
+ to_chat(user, "You wire the security assault robot assembly.")
+ name = "wired security assault robot assembly"
return
if(7)
if(istype(W, /obj/item/gun/energy/disruptorpistol))
- name = "taser ED-209 assembly"
+ name = "taser security assault robot assembly"
build_step++
to_chat(user, "You add [W] to [src].")
item_state = "ed209_taser"
@@ -400,7 +400,7 @@
if(9)
if(istype(W, /obj/item/cell))
build_step++
- to_chat(user, "You complete the ED-209.")
+ to_chat(user, "You complete the security assault robot.")
var/turf/T = get_turf(src)
new /mob/living/bot/secbot/ed209(T,created_name,lasercolor)
user.drop_from_inventory(W,get_turf(src))
diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm
index 7619893420e..5648f508375 100644
--- a/code/modules/mob/living/carbon/human/unarmed_attack.dm
+++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm
@@ -90,7 +90,7 @@ var/global/list/sparring_attack_cache = list()
target.apply_effect(attack_damage * 0.4, WEAKEN, armor)
if(BP_GROIN)
if(pain_message)
- target.visible_message("[target] looks like [target.get_pronoun("he")] [target.get_pronoun("is")] in pain!", "[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, not your [pick("testicles", "crown jewels", "clockweights", "family jewels", "marbles", "bean bags", "teabags", "sweetmeats", "goolies")]!"]")
+ target.visible_message("[target] looks like [target.get_pronoun("he")] [target.get_pronoun("is")] in pain!", "[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, that REALLY hurt!"]")
target.apply_effects(stutter = attack_damage * 2, agony = attack_damage* 3, blocked = armor)
if(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT)
if(!target.lying)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index ea6be6a516e..063d32c117b 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -84,35 +84,6 @@
to_chat(M, "You name the gun [input]. Say hello to your new friend.")
return 1
-// Blade Runner pistol.
-/obj/item/gun/projectile/revolver/deckard
- name = "\improper Deckard .44"
- desc = "A custom-built revolver, based off the semi-popular Detective Special model."
- max_shells = 6
- accuracy = 2
- icon = 'icons/obj/guns/deckard.dmi'
- icon_state = "deckard-empty"
- item_state = "deckard"
- caliber = "38"
- ammo_type = /obj/item/ammo_casing/c38
- magazine_type = null
- fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
-
-/obj/item/gun/projectile/revolver/deckard/update_icon()
- ..()
- if(loaded.len)
- icon_state = "deckard-loaded"
- else
- icon_state = "deckard-empty"
-
-/obj/item/gun/projectile/revolver/deckard/load_ammo(var/obj/item/A, mob/user)
- if(istype(A, /obj/item/ammo_magazine))
- flick("deckard-reload",src)
- ..()
-
-/obj/item/gun/projectile/revolver/deckard/emp
- ammo_type = /obj/item/ammo_casing/c38/emp
-
/obj/item/gun/projectile/revolver/derringer
name = "derringer"
desc = "A small pocket pistol, easily concealed. Uses .357 rounds."
diff --git a/code/modules/psionics/equipment/cerebro_enhancers.dm b/code/modules/psionics/equipment/cerebro_enhancers.dm
index e295f27c9ee..36a89e8cfa8 100644
--- a/code/modules/psionics/equipment/cerebro_enhancers.dm
+++ b/code/modules/psionics/equipment/cerebro_enhancers.dm
@@ -22,7 +22,7 @@
/obj/item/clothing/head/helmet/space/psi_amp/lesser
name = "psionic amplifier"
- desc = "A crown-of-thorns cerebro-energetic enhancer that interfaces directly with the brain, isolating and strengthening psionic signals. It kind of looks like a tiara having sex with an industrial robot."
+ desc = "A crown-of-thorns cerebro-energetic enhancer that interfaces directly with the brain, isolating and strengthening psionic signals. It kind of looks like a tiara."
flags_inv = 0
body_parts_covered = 0
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 7a574fdc6d9..ab9bc05e25e 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -2015,7 +2015,7 @@
glass_center_of_mass = list("x"=17, "y"=6)
/decl/reagent/drink/space_cola
- name = "Space Cola"
+ name = "Comet Cola"
description = "A refreshing beverage."
reagent_state = LIQUID
color = "#100800"
@@ -2024,13 +2024,13 @@
carbonated = TRUE
glass_icon_state = "spacecola"
- glass_name = "glass of Space Cola"
- glass_desc = "A glass of refreshing Space Cola"
+ glass_name = "glass of Comet Cola"
+ glass_desc = "A glass of refreshing Comet Cola"
glass_center_of_mass = list("x"=17, "y"=6)
/decl/reagent/drink/spacemountainwind
- name = "Mountain Wind"
- description = "Blows right through you like a space wind."
+ name = "Stellar Jolt"
+ description = "For those who have a stronger need for caffeine than they have sense."
color = "#a2ff8d"
adj_drowsy = -7
adj_sleepy = -1
@@ -2038,8 +2038,8 @@
carbonated = TRUE
glass_icon_state = "Space_mountain_wind_glass"
- glass_name = "glass of Space Mountain Wind"
- glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
+ glass_name = "glass of Stellar Jolt"
+ glass_desc = "Stellar Jolt. Lemony and full of sugar."
/decl/reagent/drink/dr_gibb
name = "Dr. Gibb"
@@ -2054,27 +2054,27 @@
glass_desc = "Dr. Gibb. Not as dangerous as the name might imply."
/decl/reagent/drink/root_beer
- name = "RnD Root Beer"
- description = "A classic Earth drink from the United Americas province."
+ name = "Getmore Root Beer"
+ description = "A classic Earth drink, made from various roots."
color = "#211100"
adj_drowsy = -6
taste_description = "sassafras and anise soda"
carbonated = TRUE
glass_icon_state = "root_beer_glass"
- glass_name = "glass of RnD Root Beer"
- glass_desc = "A glass of bubbly RnD Root Beer."
+ glass_name = "glass of Getmore Root Beer"
+ glass_desc = "A glass of bubbly Getmore Root Beer."
/decl/reagent/drink/spaceup
- name = "Space-Up"
+ name = "Vacuum Fizz"
description = "Tastes like a hull breach in your mouth."
color = "#aee5e4"
taste_description = "a hull breach"
carbonated = TRUE
glass_icon_state = "space-up_glass"
- glass_name = "glass of Space-up"
- glass_desc = "Space-up. It helps keep your cool."
+ glass_name = "glass of Vacuum Fizz"
+ glass_desc = "Vacuum Fizz. It helps keep your cool."
/decl/reagent/drink/lemon_lime
name = "Lemon Lime"
@@ -5147,14 +5147,14 @@
/decl/reagent/drink/diet_cola
name = "Diet Cola"
- description = "Space Cola! Now in diet!"
+ description = "Comet cola! Now in diet!"
color = "#100800"
taste_description = "cola and less calories"
carbonated = TRUE
glass_icon_state = "spacecola"
glass_name = "glass of diet cola"
- glass_desc = "Space Cola! Now in diet!"
+ glass_desc = "Comet cola! Now in diet!"
/decl/reagent/drink/milk/chocolate
name = "Chocolate milk"
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index f2b605d4859..c21394a93c3 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -398,8 +398,8 @@
reagents_to_add = list(/decl/reagent/drink/grenadine = 100)
/obj/item/reagent_containers/food/drinks/bottle/cola
- name = "space cola"
- desc = "Cola. In space."
+ name = "comet cola"
+ desc = "Getmore's most popular line of soda. A generic cola, otherwise."
icon_state = "colabottle"
center_of_mass = list("x"=16, "y"=6)
drink_flags = NO_EMPTY_ICON
@@ -410,7 +410,7 @@
fragile = 0
/obj/item/reagent_containers/food/drinks/bottle/space_up
- name = "\improper Space-Up"
+ name = "\improper Vacuum Fizz"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up_bottle"
center_of_mass = list("x"=16, "y"=6)
@@ -422,8 +422,8 @@
fragile = 0
/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind
- name = "\improper Space Mountain Wind"
- desc = "Blows right through you like a space wind."
+ name = "\improper Stellar Jolt"
+ desc = "For those who have a need for caffeine stronger than would be sensible."
icon_state = "space_mountain_wind_bottle"
center_of_mass = list("x"=16, "y"=6)
drink_flags = NO_EMPTY_ICON
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index ab6dc9f3daf..09a1cc8d1c8 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -1390,7 +1390,7 @@
/obj/item/reagent_containers/food/snacks/sosjerky
name = "Scaredy's Private Reserve beef jerky"
icon_state = "sosjerky"
- desc = "Beef jerky made from the finest space cows."
+ desc = "Beef jerky. A little oversalted, actually."
trash = /obj/item/trash/sosjerky
filling_color = "#631212"
center_of_mass = list("x"=15, "y"=9)
@@ -1399,9 +1399,9 @@
reagents_to_add = list(/decl/reagent/nutriment/protein = 4, /decl/reagent/sodiumchloride = 3)
/obj/item/reagent_containers/food/snacks/no_raisin
- name = "4no Raisins"
+ name = "Getmore Raisins"
icon_state = "4no_raisins"
- desc = "Best raisins in the universe. Not sure why."
+ desc = "Getmore Raisins. Dry, flavorless, and oversweetened. Sounds about right."
trash = /obj/item/trash/raisins
filling_color = "#343834"
center_of_mass = list("x"=15, "y"=4)
@@ -1410,9 +1410,9 @@
bitesize = 3
/obj/item/reagent_containers/food/snacks/spacetwinkie
- name = "space twinkie"
+ name = "creamy spongecake"
icon_state = "space_twinkie"
- desc = "Guaranteed to survive longer then you will."
+ desc = "Contrary to popular belief, Getmore's sponge cakes don't last forever. They do, however, leave a plastic-esque film coating the inside of your mouth."
trash = /obj/item/trash/space_twinkie
filling_color = "#FFE591"
center_of_mass = list("x"=15, "y"=11)
@@ -1423,7 +1423,7 @@
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
icon_state = "cheesie_honkers"
- desc = "Bite sized cheesie snacks that will honk all over your mouth"
+ desc = "Bite sized cheesie snacks, made with real cheese! A little bit of it, anyway."
trash = /obj/item/trash/cheesie
filling_color = "#FFA305"
center_of_mass = list("x"=15, "y"=9)
@@ -1432,9 +1432,9 @@
bitesize = 2
/obj/item/reagent_containers/food/snacks/syndicake
- name = "Syndi-Cakes"
+ name = "Nutri-Cakes"
icon_state = "syndi_cakes"
- desc = "An extremely moist snack cake that tastes just as good after being nuked."
+ desc = "An extremely moist snack cake."
filling_color = "#FF5D05"
center_of_mass = list("x"=16, "y"=10)
trash = /obj/item/trash/syndi_cakes
diff --git a/html/changelogs/dansemacabre-referencekiller.yml b/html/changelogs/dansemacabre-referencekiller.yml
new file mode 100644
index 00000000000..439dbb8db24
--- /dev/null
+++ b/html/changelogs/dansemacabre-referencekiller.yml
@@ -0,0 +1,44 @@
+################################
+# 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: TheDanseMacabre
+
+# 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: "Raiders no longer have such a blatantly silly pirate theme. They also have greater variation in their voidsuits."
+ - rscdel: "Removed a large number of items that are low quality, referential, or both."
+ - rscdel: "Removed the Deus Ex trenchcoat from the HoS' locker."
+ - rscdel: "Changed the descriptions of certain things that contained server-inappropriate themes."
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index c6da8519bdb..88fe771d607 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 91f0738639e..ea911c56b22 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index b38156efd23..ed588d4a42a 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 83205130783..379bab8d818 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index 1e8dbe3bdeb..7430953c91c 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/guns/deckard.dmi b/icons/obj/guns/deckard.dmi
deleted file mode 100644
index d17257c9713..00000000000
Binary files a/icons/obj/guns/deckard.dmi and /dev/null differ
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index e912731f241..135fabcbd37 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -36714,11 +36714,6 @@
name = "dead plant"
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster{
- icon_state = "grillposter";
- pixel_x = -32;
- poster_type = "/datum/poster/bay_69"
- },
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 8264405bcdf..515fa15656f 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -59124,7 +59124,6 @@
/area/security/brig)
"cJo" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/costume/imperium_monk,
/obj/structure/closet/cabinet,
/turf/simulated/floor/wood,
/area/maintenance/bar)
@@ -64041,12 +64040,10 @@
/obj/item/pen/multi,
/obj/item/device/camera,
/obj/structure/closet/cabinet{
- name = "legal closet";
- desc = "It's a storage unit for courtroom apparel and items."
+ desc = "It's a storage unit for courtroom apparel and items.";
+ name = "legal closet"
},
-/obj/item/clothing/under/lawyer/black,
/obj/item/clothing/under/lawyer/red,
-/obj/item/clothing/suit/storage/toggle/lawyer/bluejacket,
/obj/item/clothing/under/lawyer/purple,
/obj/item/clothing/suit/storage/lawyer/purpjacket,
/obj/item/clothing/shoes/brown,
diff --git a/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm b/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm
index b0b6cb5b63f..165405df503 100644
--- a/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm
+++ b/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm
@@ -18456,10 +18456,6 @@
icon_opened = "cabinet_open";
icon_state = "cabinet_closed"
},
-/obj/item/clothing/shoes/sandal/marisa{
- desc = "A set of fancy shoes that are as functional as they are comfortable.";
- name = "Gentlemans Shoes"
- },
/obj/item/clothing/under/gentlesuit,
/obj/item/clothing/head/wizard/cap,
/obj/item/clothing/suit/storage/toggle/wizrobe/gentlecoat,
@@ -18475,9 +18471,6 @@
icon_opened = "cabinet_open";
icon_state = "cabinet_closed"
},
-/obj/item/clothing/suit/wizrobe/marisa,
-/obj/item/clothing/shoes/sandal/marisa,
-/obj/item/clothing/head/wizard/marisa,
/obj/item/staff/broom,
/turf/unsimulated/floor{
name = "plating";
@@ -30769,11 +30762,6 @@
name = "dead plant"
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster{
- icon_state = "grillposter";
- pixel_x = -32;
- poster_type = "/datum/poster/bay_69"
- },
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index c488854d16d..e833adc31fc 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -34217,9 +34217,6 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/sign/goldenplaque{
- pixel_y = 32
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/hos)
diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
index af30d832e1f..5acedf9adda 100644
--- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
+++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
@@ -25707,11 +25707,6 @@
name = "dead plant"
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster{
- icon_state = "grillposter";
- pixel_x = -32;
- poster_type = "/datum/poster/bay_69"
- },
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -27392,15 +27387,6 @@
/obj/structure/table/wood{
table_reinf = "wood"
},
-/obj/effect/decal/fake_object{
- desc = "A dusty, stuffed parrot. It's firmly nailed to the table.";
- icon = 'icons/mob/npc/pets.dmi';
- icon_state = "parrot_sit";
- layer = 3.4;
- name = "Hootie";
- pixel_x = 9;
- pixel_y = 1
- },
/turf/unsimulated/floor{
icon_state = "lino_grey"
},
@@ -31828,9 +31814,6 @@
/area/antag/ninja)
"bvP" = (
/obj/structure/table/steel,
-/obj/item/clothing/head/pirate,
-/obj/item/clothing/suit/pirate,
-/obj/item/clothing/glasses/thermal/plain/monocle,
/turf/simulated/floor/carpet/art,
/area/shuttle/skipjack)
"bvQ" = (
@@ -32304,8 +32287,6 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
-/obj/item/clothing/under/pants/striped,
-/obj/item/melee/whip,
/obj/structure/closet/cabinet,
/turf/simulated/floor/wood,
/area/shuttle/skipjack)
@@ -33047,10 +33028,6 @@
dir = 10
},
/obj/effect/decal/cleanable/blood/oil,
-/obj/item/clothing/suit/space/void/atmos,
-/obj/item/clothing/head/helmet/space/void/atmos,
-/obj/item/clothing/head/helmet/space/void/mining,
-/obj/item/clothing/suit/space/void/mining,
/obj/item/tank/oxygen,
/obj/item/tank/oxygen,
/obj/item/clothing/shoes/magboots,
@@ -33059,6 +33036,8 @@
/obj/item/clothing/mask/breath,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/steel,
+/obj/random/voidsuit,
+/obj/random/voidsuit,
/turf/simulated/floor/tiled,
/area/shuttle/skipjack)
"bAf" = (
@@ -33127,12 +33106,8 @@
dir = 8
},
/obj/structure/closet/cabinet,
-/obj/item/clothing/under/pants/tacticool,
-/obj/item/clothing/under/color/black,
-/obj/item/clothing/under/color/pink,
-/obj/item/clothing/under/unathi,
-/obj/item/clothing/accessory/poncho/unathimantle,
-/obj/item/clothing/accessory/poncho,
+/obj/random/colored_jumpsuit,
+/obj/random/colored_jumpsuit,
/turf/simulated/floor/wood,
/area/shuttle/skipjack)
"bAs" = (
@@ -33303,9 +33278,6 @@
dir = 10
},
/obj/effect/decal/cleanable/blood,
-/obj/item/reagent_containers/glass/bucket/wood{
- pixel_y = 6
- },
/turf/simulated/floor/tiled,
/area/shuttle/skipjack)
"bAX" = (
@@ -33650,7 +33622,6 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/skipjack)
"bCd" = (
-/obj/item/material/harpoon,
/obj/item/tank/oxygen,
/obj/item/clothing/shoes/magboots,
/obj/effect/floor_decal/corner/red{
@@ -33661,9 +33632,8 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/steel,
-/obj/item/clothing/suit/space/void/merc,
/obj/item/clothing/mask/breath,
-/obj/item/clothing/head/helmet/space/void/merc,
+/obj/random/voidsuit,
/turf/simulated/floor/tiled,
/area/shuttle/skipjack)
"bCe" = (
@@ -33678,9 +33648,8 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/steel,
-/obj/item/clothing/suit/space/void/engineering,
/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/head/helmet/space/void/engineering,
+/obj/random/voidsuit,
/turf/simulated/floor/tiled,
/area/shuttle/skipjack)
"bCf" = (