diff --git a/code/game/objects/items/magazine.dm b/code/game/objects/items/magazine.dm index 59640c4c01..1b8d03f5da 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 9ca72b2d0a..73de5448be 100644 --- a/code/modules/games/cah_white_cards.dm +++ b/code/modules/games/cah_white_cards.dm @@ -427,7 +427,6 @@ "Masturbation.", "Me time.", "Me.", - "MechaHitler.", "Media coverage.", "Medieval Times Dinner & Tournament.", "Men.", diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 97e629db98..b3cfce6bfd 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -130,7 +130,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 22ce2a091e..fe5baf6641 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/axis_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 9831f594c1..cbd6206420 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: