From b4922aedc9bdc92b921cb7d672f7f558590c8112 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Thu, 14 Sep 2023 17:43:57 -0400 Subject: [PATCH] Remove all mention of nazis from code Also removes some old lore references from the listening post --- code/game/objects/items/magazine.dm | 1 - code/modules/games/cah_white_cards.dm | 11 +- .../projectiles/guns/energy/nuclear.dm | 2 +- .../vore/fluffstuff/custom_clothes_vr.dm | 4 +- html/archivedchangelog.html | 10 +- maps/gateway_archive_vr/listeningpost.dm | 204 +----------------- maps/gateway_vr/listeningpost.dm | 204 +----------------- maps/gateway_vr/listeningpost.dmm | 25 --- 8 files changed, 15 insertions(+), 446 deletions(-) diff --git a/code/game/objects/items/magazine.dm b/code/game/objects/items/magazine.dm index 59640c4c010..1b8d03f5dad 100644 --- a/code/game/objects/items/magazine.dm +++ b/code/game/objects/items/magazine.dm @@ -37,7 +37,6 @@ "LOSE WEIGHT THREE TIMES FASTER WITH THESE LOW-G MANEUVERS!", "SHOCKING FIGURES REVEAL MORE TEENS DIE TO UNATHI HONOUR DUELS THAN GUN VIOLENCE", "MY DAUGHTER JOINED A NEURAL COLLECTIVE AND NOW SHE CAN TASTE SPACETIME: FULL STORY INSIDE", - "WERE THE NAZIS PSYCHIC? ONE HISTORIAN TELLS ALL", "TAJARANS: CUTE AND CUDDLY, OR INFILTRATING THE GOVERNMENT? FIND OUT MORE INSIDE", "IS THE SOLAR GOVERNMENT CREATING AN AI SUPERINTELLIGENCE NEAR MERCURY? ONE EXPERT REVEALS SHOCKING INSIDER DETAILS!", "TOP TEN HISTORICAL FIGURES THAT WERE TWO PROMETHEANS IN A TRENCHCOAT", diff --git a/code/modules/games/cah_white_cards.dm b/code/modules/games/cah_white_cards.dm index 3ab0df883a9..9b3363b89df 100644 --- a/code/modules/games/cah_white_cards.dm +++ b/code/modules/games/cah_white_cards.dm @@ -456,7 +456,6 @@ "Natalie Portman.", "Natural male enhancement.", "Natural selection.", - "Nazis.", "Necrophilia.", "Neil Patrick Harris.", "New Age music.", @@ -718,7 +717,7 @@ "Gay aliens.", "The way white people is.", "Reverse cowgirl.", - "The Quesadilla Explosion Salad from Chili’s.", + "The Quesadilla Explosion Salad from Chili�s.", "Actually getting shot, for real.", "Not having sex.", "Vietnam flashbacks.", @@ -743,7 +742,7 @@ "A greased-up Matthew McConaughey.", "An unstoppable wave of fire ants.", "Not contributing to society in any meaningful way.", - "An all-midget production of Shakespeare’s Richard III.", + "An all-midget production of Shakespeare�s Richard III.", "Screaming like a maniac.", "The moist, demanding chasm of his mouth.", "Filling every orifice with butterscotch pudding.", @@ -752,7 +751,7 @@ "Velcro.", "A PowerPoint presentation.", "A surprising amount of hair.", - "Eating Tom Selleck’s mustache to gain his powers.", + "Eating Tom Selleck�s mustache to gain his powers.", "Roland the Farter, flatulist to the king.", "A pile of squirming bodies.", "Buying the right pants to be cool.", @@ -764,7 +763,7 @@ "A lamprey swimming up the toilet and latching onto your taint.", "Jumping out at people.", "A black male in his early 20s, last seen wearing a hoodie.", - "Mufasa’s death scene.", + "Mufasa�s death scene.", "Bill Clinton, naked on a bearskin rug with a saxophone.", "Demonic possession.", "The Harlem Globetrotters.", @@ -778,7 +777,7 @@ "Getting your dick stuck in a Chinese finger trap with another dick.", "Fisting.", "The thin veneer of situational causality that underlies porn.", - "Girls that always be textin’.", + "Girls that always be textin�.", "Blowing some dudes in an alley.", "Drinking ten 5-hour ENERGYs to get fifty continuous hours of energy.", "Sneezing, farting, and coming at the same time." diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 4a604b7cbb4..2f6d7a754ae 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -127,7 +127,7 @@ battery_lock = 1 // In exchange for balance, you cannot remove the battery. Also there's no sprite for that and I fucking suck at sprites. -Ace projectile_type = /obj/item/projectile/beam/stun/med - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 2) // Illegal tech cuz Space Nazis + origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 2) modifystate = "ep08stun" firemodes = list( diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 3775853adbd..1dec80b8535 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -197,9 +197,9 @@ item_state = "brittrenchcoat" //For general use -/obj/item/clothing/suit/storage/vest/hoscoat/nazi_greatcoat +/obj/item/clothing/suit/storage/vest/hoscoat/ancient_greatcoat name = "Greatcoat" - desc = "Perfect attire for kicking down the doors of suspected dissidents; this coat gives off an imposing look, while offering a luxuriously plush fur liner." + desc = "This coat gives off an imposing look, while offering a luxuriously plush fur liner." icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "greatcoat" diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html index 9831f594c14..cbd6206420b 100644 --- a/html/archivedchangelog.html +++ b/html/archivedchangelog.html @@ -241,7 +241,7 @@ Stick old posts here to prevent cluttering of main changelog.

August 22, 2012

Cael_Aislinn updated:

+
@@ -300,7 +300,7 @@ Stick old posts here to prevent cluttering of main changelog.
  • Fixed the bug where helmets would not turn off when placed into backpacks.
  • Added more "cancel" buttons to various dialogs.
    • - +

    CIB updated:

    - +

    Abi79 updated: