mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 15:08:34 +01:00
Merge pull request #15398 from Very-Soft/spacenazis
Remove all mention of nazis from code
This commit is contained in:
@@ -426,7 +426,6 @@
|
||||
"Masturbation.",
|
||||
"Me time.",
|
||||
"Me.",
|
||||
"MechaHitler.",
|
||||
"Media coverage.",
|
||||
"Medieval Times Dinner & Tournament.",
|
||||
"Men.",
|
||||
@@ -456,7 +455,6 @@
|
||||
"Natalie Portman.",
|
||||
"Natural male enhancement.",
|
||||
"Natural selection.",
|
||||
"Nazis.",
|
||||
"Necrophilia.",
|
||||
"Neil Patrick Harris.",
|
||||
"New Age music.",
|
||||
@@ -718,7 +716,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 +741,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 +750,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 +762,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 +776,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."
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user