Skip to content

Commit

Permalink
Removes mentions of Russians, Capitalism/Stalinium Golems, Derelict D…
Browse files Browse the repository at this point in the history 
…rone Subtype, Tweaks AI Ion Laws (#2379)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

It does exactly what it says on the tin.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Not lore compliant. Old sprites with gear that nobody or nothing uses.
"Gas the lizards" is not an acceptable term.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Russian Battle Coat, Russian Uniform, Russian Officer Uniform,
Russian Helmet, Russian Boots, Russian Balaclava
imagedel: Deleted sprites relating to the outfits above.
del: Stalinium and Capitalist Golems
del: Derelict Drones
tweak: The butterbear is now on the Frontiersmen team.
tweak: Modified the list of laws that an AI may recieve from being
ioned.
sounddel: The Soviet Anthem and the US Anthem.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
@meemofcourse
meemofcourse authored Oct 17, 2023
1 parent 6b5364a commit b161960
Show file tree
Hide file tree
Showing 51 changed files with 47 additions and 388 deletions.
3 changes: 0 additions & 3 deletions _maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@
/area/ruin/unpowered/corprejectengineering)
"cN" = (
/obj/structure/safe/floor,
/obj/item/stack/sheet/capitalisium{
amount = 10
},
/obj/item/hand_tele,
/obj/item/stack/sheet/mineral/adamantine,
/obj/item/stack/sheet/mineral/adamantine,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_demon.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"tR" = (
/obj/structure/closet/gimmick/russian,
/obj/structure/closet/gimmick/tacticool,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plasteel/dark,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/DJstation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@
dir = 1
},
/obj/structure/rack,
/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/head/trapper,
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/head/bandana,
/obj/effect/turf_decal/corner/opaque/white{
dir = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
pixel_x = 1;
pixel_y = 7
},
/obj/item/clothing/under/syndicate/soviet,
/obj/item/clothing/under/syndicate,
/obj/structure/closet/radiation/empty{
anchored = 1
},
Expand Down
3 changes: 0 additions & 3 deletions _maps/deprecated/Ruins/TheDerelict.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,6 @@
/turf/open/floor/plasteel/airless,
/area/ruin/space/derelict/bridge/access)
"fw" = (
/obj/effect/mob_spawn/drone/derelict,
/turf/open/floor/plasteel/airless,
/area/ruin/space/derelict/bridge/access)
"fx" = (
Expand Down Expand Up @@ -1839,7 +1838,6 @@
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/singularity_engine)
"in" = (
/obj/effect/mob_spawn/drone/derelict,
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/singularity_engine)
"io" = (
Expand Down Expand Up @@ -4396,7 +4394,6 @@
/obj/machinery/power/terminal{
dir = 1
},
/obj/effect/mob_spawn/drone/derelict,
/obj/structure/cable{
icon_state = "0-2"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/deprecated/Ships/independent_high.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@
/obj/effect/turf_decal/corner/opaque/red/diagonal,
/obj/structure/toilet/secret{
dir = 4;
secret_type = /obj/item/stack/sheet/capitalisium
secret_type = /obj/item/spacecash/bundle/c10000
},
/turf/open/floor/plasteel/white,
/area/ship/crew/dorm)
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/shiptest/pirate_ember.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2247,14 +2247,14 @@
/obj/effect/decal/cleanable/cobweb,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/clothing/under/syndicate/camo,
/obj/item/clothing/under/syndicate/soviet,
/obj/item/clothing/under/syndicate/camo,
/obj/item/clothing/neck/scarf/black,
/obj/item/clothing/neck/cloak/hos,
/obj/item/clothing/mask/bandana/black{
pixel_x = 1;
pixel_y = -4
},
/obj/item/clothing/mask/russian_balaclava,
/obj/item/clothing/mask/gas/sechailer/minutemen,
/obj/item/clothing/suit/armor/vest/marine/medium,
/obj/item/storage/belt/military,
/obj/item/clothing/shoes/cowboy/black,
Expand Down Expand Up @@ -5744,9 +5744,9 @@
pixel_x = 1;
pixel_y = -4
},
/obj/item/clothing/mask/russian_balaclava,
/obj/item/clothing/mask/russian_balaclava,
/obj/item/clothing/mask/russian_balaclava,
/obj/item/clothing/mask/gas/sechailer/minutemen,
/obj/item/clothing/mask/gas/sechailer/minutemen,
/obj/item/clothing/mask/gas/sechailer/minutemen,
/obj/item/storage/belt/military,
/obj/item/storage/belt/military,
/obj/item/storage/belt/military/army,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/shiptest/syndicate_gorlex_komodo.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3649,7 +3649,7 @@
/obj/effect/turf_decal/techfloor{
dir = 10
},
/obj/item/clothing/mask/russian_balaclava,
/obj/item/clothing/mask/gas/sechailer/minutemen,
/obj/item/clothing/under/syndicate/skirt,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
Expand Down
11 changes: 0 additions & 11 deletions code/game/machinery/droneDispenser.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,6 @@
power_used = 2000
starting_amount = 10000

// If the derelict gets lonely, make more friends.
/obj/machinery/droneDispenser/derelict
name = "derelict drone shell dispenser"
desc = "A rusty machine that, when supplied with metal and glass, will periodically create a derelict drone shell. Does not need to be manually operated."
dispense_type = /obj/effect/mob_spawn/drone/derelict
end_create_message = "dispenses a derelict drone shell."
metal_cost = 10000
glass_cost = 5000
starting_amount = 0
cooldownTime = 600

// An example of a custom drone dispenser.
// This one requires no materials and creates basic hivebots
/obj/machinery/droneDispenser/hivebot
Expand Down
6 changes: 0 additions & 6 deletions code/game/objects/effects/spawners/bundle.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@
/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/obj/item/clothing/glasses/eyepatch)

/obj/effect/spawner/bundle/costume/commie
name = "commie costume spawner"
items = list(
/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/head/trapper)

/obj/effect/spawner/bundle/costume/imperium_monk
name = "imperium monk costume spawner"
items = list(
Expand Down
14 changes: 0 additions & 14 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,20 +752,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
/obj/item/stack/sheet/paperframes/fifty
amount = 50

/obj/item/stack/sheet/capitalisium
name = "capitalisium sheets"
singular_name = "capitalisium sheet"
desc = "A source of raw capitalism, capable of bringing forth the prophesized Capitalist Golem."
icon_state = "sheet-capitalisium"
merge_type = /obj/item/stack/sheet/capitalisium

/obj/item/stack/sheet/stalinium
name = "stalinium sheets"
singular_name = "stalinium sheet"
desc = "A source of raw socialism, capable of bringing forth the prophesized Soviet Golem."
icon_state = "sheet-stalinium"
merge_type = /obj/item/stack/sheet/stalinium

/obj/item/stack/sheet/meat
name = "meat sheets"
desc = "Something's bloody meat compressed into a nice solid sheet."
Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/items/storage/backpack.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,10 +671,9 @@
new /obj/item/grenade/c4/x4(src)

/obj/item/storage/backpack/duffelbag/syndie/firestarter
desc = "A large duffel bag containing a New Russian pyro backpack sprayer, Elite hardsuit, a Stechkin APS pistol, minibomb, ammo, and other equipment."
desc = "A large duffel bag containing a pyro backpack sprayer, Elite hardsuit, a Stechkin APS pistol, minibomb, ammo, and other equipment."

/obj/item/storage/backpack/duffelbag/syndie/firestarter/PopulateContents()
new /obj/item/clothing/under/syndicate/soviet(src)
new /obj/item/watertank/op(src)
new /obj/item/clothing/suit/space/hardsuit/syndi/elite(src)
new /obj/item/gun/ballistic/automatic/pistol/APS(src)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tanks/watertank.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@
//Operator backpack spray
/obj/item/watertank/op
name = "backpack water tank"
desc = "A New Russian backpack spray for systematic cleansing of carbon lifeforms."
desc = "A backpack spray for systematic cleansing of carbon lifeforms."
icon_state = "waterbackpackop"
item_state = "waterbackpackop"
w_class = WEIGHT_CLASS_NORMAL
Expand Down
11 changes: 0 additions & 11 deletions code/game/objects/structures/crates_lockers/closets/gimmick.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,6 @@
desc = "It's a storage unit for things that have no right being here."
icon_state = "syndicate"

/obj/structure/closet/gimmick/russian
name = "\improper Russian surplus closet"
desc = "It's a storage unit for Russian standard-issue surplus."

/obj/structure/closet/gimmick/russian/PopulateContents()
..()
for(var/i in 1 to 5)
new /obj/item/clothing/head/trapper(src)
for(var/i in 1 to 5)
new /obj/item/clothing/under/costume/soviet(src)

/obj/structure/closet/gimmick/tacticool
name = "tacticool gear closet"
desc = "It's a storage unit for Tacticool gear."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/fugitive_role_spawners.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
back_story = "russian"
desc = "A small sleeper typically used to make long distance travel a bit more bearable."
mob_name = "russian"
outfit = /datum/outfit/russiancorpse/hunter
outfit = /datum/outfit/frontier/hunter
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper"

Expand Down
4 changes: 2 additions & 2 deletions code/modules/antagonists/fugitive/fugitive_outfits.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@
W.registered_name = H.real_name
W.update_label()

/datum/outfit/russiancorpse/hunter
/datum/outfit/frontier/hunter
name = "Frontiersman Corpse (Hunter)"
ears = /obj/item/radio/headset
r_hand = /obj/item/gun/ballistic/rifle/boltaction

/datum/outfit/russiancorpse/hunter/pre_equip(mob/living/carbon/human/H)
/datum/outfit/frontier/hunter/pre_equip(mob/living/carbon/human/H)
if(prob(50))
head = /obj/item/clothing/head/trapper

Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/bounties/medical.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

/datum/bounty/item/medical/liver
name = "Livers"
description = "Multiple high-ranking CentCom diplomats have been hospitalized with liver failure after a recent meeting with Third Soviet Union ambassadors. Help us out, will you?"
description = "Multiple high-ranking CentCom diplomats have been hospitalized with liver failure after a recent meeting. Help us out, will you?"
reward = 10000
required_count = 3
wanted_types = list(/obj/item/organ/liver)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/civilian.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@

/datum/supply_pack/civilian/carpet_exotic
name = "Exotic Carpet Crate"
desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 8 different flooring patterns."
desc = "Exotic carpets for all your decorating needs. Contains 100 tiles each of 8 different flooring patterns."
cost = 3000
contains = list(/obj/item/stack/tile/carpet/blue/fifty,
/obj/item/stack/tile/carpet/blue/fifty,
Expand Down
10 changes: 1 addition & 9 deletions code/modules/clothing/head/helmet.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,17 +475,9 @@
armor = list("melee" = 20, "bullet" = 10, "laser" = 30, "energy" = 40, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 50)
strip_delay = 60

/obj/item/clothing/head/helmet/rus_helmet
name = "russian helmet"
desc = "It can hold a bottle of vodka."
icon_state = "rus_helmet"
item_state = "rus_helmet"
armor = list("melee" = 25, "bullet" = 30, "laser" = 0, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 50)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/helmet

/obj/item/clothing/head/helmet/r_trapper
name = "reinforced trapper hat"
desc = "An occasional sight on the heads of soldiers stationed on cold worlds. 200% bear."
desc = "An occasional sight on the heads of Frontiersmen stationed on cold worlds. 200% bear."
icon_state = "rus_ushanka"
item_state = "rus_ushanka"
body_parts_covered = HEAD
Expand Down
9 changes: 0 additions & 9 deletions code/modules/clothing/masks/boxing.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,3 @@
desc = "Worn by robust fighters who are willing to do anything to win."
icon_state = "luchar"
item_state = "luchar"

/obj/item/clothing/mask/russian_balaclava
name = "russian balaclava"
desc = "Protects your face from snow."
icon_state = "rus_balaclava"
item_state = "rus_balaclava"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
27 changes: 0 additions & 27 deletions code/modules/clothing/outfits/standard.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,33 +269,6 @@
shoes = /obj/item/clothing/shoes/sandal/marisa
head = /obj/item/clothing/head/wizard/marisa

/datum/outfit/centcom/soviet
name = "Soviet Admiral"

uniform = /obj/item/clothing/under/costume/soviet
head = /obj/item/clothing/head/pirate/captain
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/thermal/eyepatch
suit = /obj/item/clothing/suit/pirate/captain
back = /obj/item/storage/backpack/satchel/leather
belt = /obj/item/gun/ballistic/revolver/mateba

id = /obj/item/card/id/centcom

/datum/outfit/centcom/soviet/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return

var/obj/item/card/id/W = H.wear_id
W.access = get_all_accesses()
W.access += get_centcom_access("Admiral")
W.assignment = "Admiral"
W.registered_name = H.real_name
W.update_label()
..()

/datum/outfit/mobster
name = "Mobster"

Expand Down
8 changes: 0 additions & 8 deletions code/modules/clothing/shoes/miscellaneous.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,14 +374,6 @@
active = FALSE
set_light_on(active)

/obj/item/clothing/shoes/russian
name = "russian boots"
desc = "Comfy shoes."
icon_state = "rus_shoes"
item_state = "rus_shoes"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
lace_time = 8 SECONDS

/obj/item/clothing/shoes/cowboy
name = "cowboy boots"
desc = "A small sticker lets you know they've been inspected for snakes, It is unclear how long ago the inspection took place..."
Expand Down
17 changes: 0 additions & 17 deletions code/modules/clothing/suits/armor.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,23 +317,6 @@
resistance_flags = FLAMMABLE
armor = list("melee" = 20, "bullet" = 10, "laser" = 30, "energy" = 40, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 50)

/obj/item/clothing/suit/armor/vest/russian
name = "russian vest"
desc = "A bulletproof vest with forest camo. Good thing there's plenty of forests to hide in around here, right?"
icon_state = "armor_camo"
item_state = "rus_armor"
armor = list("melee" = 25, "bullet" = 30, "laser" = 0, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 50)

/obj/item/clothing/suit/armor/vest/russian_coat
name = "russian battle coat"
desc = "Used in extremly cold fronts, made out of real bears."
icon_state = "armor_coat"
item_state = "rus_coat"
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
armor = list("melee" = 25, "bullet" = 20, "laser" = 20, "energy" = 30, "bomb" = 20, "bio" = 50, "rad" = 20, "fire" = -10, "acid" = 50)

/obj/item/clothing/suit/armor/hos/inteq
name = "inteq battle coat"
desc = "A luxurious brown coat made from a crossweave of kevlar and ballistic fibre, the collar and wrist trims are made from genuine wolf fur. as protective as it is stylish."
Expand Down
7 changes: 0 additions & 7 deletions code/modules/clothing/suits/miscellaneous.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,6 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR

/obj/item/clothing/suit/security/officer/russian
name = "\improper Russian officer's jacket"
desc = "This jacket is for those special occasions when a russian officer isn't required to wear their armor."
icon_state = "officertanjacket"
item_state = "officertanjacket"
body_parts_covered = CHEST|ARMS

/obj/item/clothing/suit/shrine_maiden
name = "shrine maiden's outfit"
desc = "Makes you want to exterminate some troublesome youkai."
Expand Down
20 changes: 0 additions & 20 deletions code/modules/clothing/under/costume.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@
item_state = "pirate"
can_adjust = FALSE

/obj/item/clothing/under/costume/soviet
name = "soviet uniform"
desc = "For the Motherland!"
icon_state = "soviet"
item_state = "soviet"
can_adjust = FALSE

/obj/item/clothing/under/costume/kilt
name = "kilt"
desc = "Includes shoes and plaid."
Expand Down Expand Up @@ -196,19 +189,6 @@
icon_state = "blue_mech_suit"
item_state = "blue_mech_suit"

/obj/item/clothing/under/costume/russian_officer
name = "\improper Russian officer's uniform"
desc = "The latest in fashionable russian outfits."
icon = 'icons/obj/clothing/under/security.dmi'
icon_state = "hostanclothes"
item_state = "hostanclothes"
mob_overlay_icon = 'icons/mob/clothing/under/security.dmi'
alt_covers_chest = TRUE
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
sensor_mode = SENSOR_COORDS
random_sensor = FALSE

/obj/item/clothing/under/costume/jackbros
name = "jack bros outfit"
desc = "For when it's time to hee some hos."
Expand Down
Loading

2 comments on commit b161960

@RikCost
Copy link

@RikCost RikCost commented on b161960 Oct 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you rename russians to frontiersmen? And why are you deleting all mentions of the Soviet? Maybe instead of deleting everything Russian, maybe rename it to Soviet? Now you're just deleting content from the repository. Or its for lore changing?

@meemofcourse
Copy link
Contributor Author

@meemofcourse meemofcourse commented on b161960 Oct 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why [do] you [rename] russians to frontiersmen? And [why are you] deleting all mentions of the Soviet? Maybe instead of deleting everything Russian, maybe rename it to Soviet? Now [you're] just deleting content from [the] repository

the frontiersmen were introduced as a replacement for the revolutionary space communists you see in standard /tg/ based station because it doesn't fit with the setting of post-war sci-fi shiptest (communism isn't funny), and the concept of the Space USSR does not exist in shiptest because every country in earth blew itself up and reorganized itself into SolGov, a highly germanic organization in nature. the average person in the frontier also probably has no clue of the concept of the ussr.

this is old cruft that an average player has absolutely zero chance of obtaining outside of admin intervention.

Please sign in to comment.