mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
[LORE] Replaces most uses of "Russian" with "Soviet" (#26822)
* no russian * space * more spaces * Update walls_mineral.dm Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> * Update space_ruins.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> --------- Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
PopeDaveThe3th
co-authored by
CRUNCH
AffectedArc07
CRUNCH
AffectedArc07
parent
9225cd5817
commit
e657597b1c
@@ -2666,6 +2666,7 @@
|
||||
/area/ruin/space/deepstorage)
|
||||
"pk" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/obj/structure/rack,
|
||||
/obj/item/stack/spacecash/c500,
|
||||
/obj/effect/spawner/lootdrop/bluespace_tap/cultural,
|
||||
@@ -3533,7 +3534,7 @@
|
||||
},
|
||||
/area/ruin/space/deepstorage)
|
||||
"vo" = (
|
||||
/obj/item/salvage/ruin/russian,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "dark"
|
||||
},
|
||||
@@ -3940,6 +3941,8 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/ruin/space/deepstorage)
|
||||
"ye" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/obj/structure/rack,
|
||||
/obj/item/grenade/confetti,
|
||||
/obj/item/grenade/confetti,
|
||||
@@ -4815,7 +4818,7 @@
|
||||
/obj/structure/railing{
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/salvage/ruin/russian,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "dark"
|
||||
},
|
||||
@@ -6188,7 +6191,7 @@
|
||||
/area/ruin/space/unpowered)
|
||||
"Og" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/salvage/ruin/russian,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/ruin/space/deepstorage)
|
||||
"Oh" = (
|
||||
|
||||
@@ -310,11 +310,11 @@
|
||||
"aQ" = (
|
||||
/obj/structure/rack,
|
||||
/obj/item/clothing/suit/space/syndicate/orange{
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
|
||||
name = "Cosmonaut Security Suit"
|
||||
},
|
||||
/obj/item/clothing/head/helmet/space/syndicate/orange{
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
|
||||
name = "Cosmonaut Security Helmet"
|
||||
},
|
||||
/obj/item/clothing/mask/breath,
|
||||
@@ -367,7 +367,7 @@
|
||||
pixel_y = 28
|
||||
},
|
||||
/obj/machinery/economy/vending/cigarette/free{
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plasteel{
|
||||
@@ -512,7 +512,7 @@
|
||||
/area/ruin/space/djstation)
|
||||
"bp" = (
|
||||
/obj/structure/chair/office/light,
|
||||
/mob/living/simple_animal/hostile/russian/ranged/mosin,
|
||||
/mob/living/simple_animal/hostile/soviet/ranged/mosin,
|
||||
/turf/simulated/floor/plasteel/dark,
|
||||
/area/ruin/space/djstation)
|
||||
"bq" = (
|
||||
@@ -583,7 +583,7 @@
|
||||
pixel_y = 17
|
||||
},
|
||||
/obj/item/phone{
|
||||
desc = "An old Russian phone. The dial tone is still humming.";
|
||||
desc = "An old Soviet phone. The dial tone is still humming.";
|
||||
name = "spin-dial phone";
|
||||
pixel_x = 1;
|
||||
pixel_y = 1
|
||||
@@ -797,11 +797,11 @@
|
||||
/area/ruin/space/djstation)
|
||||
"yr" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/salvage/ruin/russian,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ruin/space/djstation)
|
||||
"Zp" = (
|
||||
/obj/item/salvage/ruin/russian,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ruin/space/djstation)
|
||||
|
||||
|
||||
@@ -260,7 +260,7 @@
|
||||
"aL" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/phone{
|
||||
desc = "An old Russian phone. The dial tone is still humming.";
|
||||
desc = "An old Soviet phone. The dial tone is still humming.";
|
||||
name = "spin-dial phone"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
@@ -272,7 +272,7 @@
|
||||
/obj/structure/chair/comfy/red{
|
||||
dir = 1
|
||||
},
|
||||
/mob/living/simple_animal/hostile/russian/ranged/mosin,
|
||||
/mob/living/simple_animal/hostile/soviet/ranged/mosin,
|
||||
/turf/simulated/floor/plasteel/dark,
|
||||
/area/ruin/space/derelict/bridge)
|
||||
"aN" = (
|
||||
@@ -317,7 +317,7 @@
|
||||
/area/ruin/space/derelict/bridge)
|
||||
"aS" = (
|
||||
/obj/machinery/economy/vending/cigarette/free{
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 9;
|
||||
@@ -351,11 +351,11 @@
|
||||
"aX" = (
|
||||
/obj/structure/closet/cabinet,
|
||||
/obj/item/clothing/suit/space/syndicate/blue{
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
|
||||
name = "Cosmonaut Command Suit"
|
||||
},
|
||||
/obj/item/clothing/head/helmet/space/syndicate/blue{
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
|
||||
name = "Cosmonaut Command Helmet"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
@@ -725,7 +725,7 @@
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"bU" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/salvage/ruin/russian,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 8;
|
||||
icon_state = "darkred"
|
||||
@@ -880,7 +880,7 @@
|
||||
/turf/simulated/floor/plasteel/dark,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"cp" = (
|
||||
/obj/item/salvage/ruin/russian,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 8;
|
||||
icon_state = "darkred"
|
||||
@@ -953,11 +953,11 @@
|
||||
"cz" = (
|
||||
/obj/structure/rack,
|
||||
/obj/item/clothing/suit/space/syndicate/orange{
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
|
||||
name = "Cosmonaut Security Suit"
|
||||
},
|
||||
/obj/item/clothing/head/helmet/space/syndicate/orange{
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
|
||||
name = "Cosmonaut Security Helmet"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
@@ -1410,7 +1410,7 @@
|
||||
/obj/item/pen,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/newscaster{
|
||||
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
|
||||
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
|
||||
layer = 3.3;
|
||||
name = "custom placement";
|
||||
pixel_x = 27
|
||||
@@ -1831,7 +1831,7 @@
|
||||
/area/ruin/space/derelict/crew_quarters)
|
||||
"eH" = (
|
||||
/obj/machinery/newscaster{
|
||||
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
|
||||
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
|
||||
layer = 3.3;
|
||||
name = "custom placement";
|
||||
pixel_x = 30
|
||||
@@ -2269,7 +2269,7 @@
|
||||
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
|
||||
name = "Human remains"
|
||||
},
|
||||
/mob/living/simple_animal/hostile/russian/ranged/mosin,
|
||||
/mob/living/simple_animal/hostile/soviet/ranged/mosin,
|
||||
/turf/simulated/floor/plasteel/dark,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"fF" = (
|
||||
@@ -2380,7 +2380,7 @@
|
||||
name = "suspicious button"
|
||||
},
|
||||
/obj/machinery/economy/vending/cigarette/free{
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
},
|
||||
/obj/effect/landmark/damageturf,
|
||||
/turf/simulated/floor/wood,
|
||||
@@ -3028,7 +3028,7 @@
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
"hC" = (
|
||||
/obj/structure/chair/stool,
|
||||
/mob/living/simple_animal/hostile/russian,
|
||||
/mob/living/simple_animal/hostile/soviet,
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
"hD" = (
|
||||
@@ -3102,7 +3102,7 @@
|
||||
"hM" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/economy/vending/cigarette/free{
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 5;
|
||||
@@ -3278,11 +3278,11 @@
|
||||
"ik" = (
|
||||
/obj/structure/rack,
|
||||
/obj/item/clothing/head/helmet/space/syndicate/black/engie{
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
|
||||
name = "Cosmonaut Engineering Helmet"
|
||||
},
|
||||
/obj/item/clothing/suit/space/syndicate/black/engie{
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
|
||||
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
|
||||
name = "Cosmonaut Engineering Suit"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
@@ -3635,7 +3635,7 @@
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"jj" = (
|
||||
/obj/item/paper/djstation{
|
||||
info = "Fuck. Fuckfuckfuck. I knew this mission was a mistake, that idiot Thomas got himself killed by some angry Russian security bot in the armoury, and the Lt. ran into the annex like a moron and got himself trapped. Now I'm just sitting on my god damn hands because this shuttle won't bloody move. Stupid USSP piece of shit docking arm must be jammed and I don't have the kit to go out and fix it.<br><br>Who the hell attacks a space station without EVA gear anyways? It's not like you can just bloody well waltz out into space with a hot coffee and shrug it off.";
|
||||
info = "Fuck. Fuckfuckfuck. I knew this mission was a mistake, that idiot Thomas got himself killed by some angry commie security bot in the armoury, and the Lt. ran into the annex like a moron and got himself trapped. Now I'm just sitting on my god damn hands because this shuttle won't bloody move. Stupid USSP piece of shit docking arm must be jammed and I don't have the kit to go out and fix it.<br><br>Who the hell attacks a space station without EVA gear anyways? It's not like you can just bloody well waltz out into space with a hot coffee and shrug it off.";
|
||||
name = "unknown report"
|
||||
},
|
||||
/turf/simulated/floor/mineral/plastitanium/red,
|
||||
@@ -4291,7 +4291,7 @@
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/mob/living/simple_animal/hostile/russian,
|
||||
/mob/living/simple_animal/hostile/soviet,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ruin/space/derelict/crew_quarters)
|
||||
"kF" = (
|
||||
@@ -4629,7 +4629,7 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"lw" = (
|
||||
/obj/structure/statue/russian_mulebot,
|
||||
/obj/structure/statue/soviet_mulebot,
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"lx" = (
|
||||
@@ -4995,7 +4995,7 @@
|
||||
"mx" = (
|
||||
/obj/structure/closet/crate/can,
|
||||
/obj/item/clothing/under/costume/mankini{
|
||||
desc = "No honest Russian would wear this abomination";
|
||||
desc = "No honest comrade would wear this abomination";
|
||||
name = "lucky underwear"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
@@ -5174,7 +5174,7 @@
|
||||
/area/space/nearstation)
|
||||
"mY" = (
|
||||
/obj/machinery/economy/vending/cigarette/free{
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "bar"
|
||||
@@ -5967,7 +5967,7 @@
|
||||
desc = "An issue of The Griffon. Was Nanotrasen supplying this station at some point?"
|
||||
},
|
||||
/obj/machinery/newscaster{
|
||||
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
|
||||
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
|
||||
layer = 3.3;
|
||||
name = "custom placement";
|
||||
pixel_x = 27
|
||||
@@ -6402,7 +6402,7 @@
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"ql" = (
|
||||
/obj/machinery/economy/vending/cigarette/free{
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "redfull"
|
||||
@@ -6498,7 +6498,7 @@
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/newscaster{
|
||||
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
|
||||
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
|
||||
layer = 3.3;
|
||||
name = "custom placement";
|
||||
pixel_x = 27
|
||||
@@ -6942,7 +6942,7 @@
|
||||
/obj/structure/statue/diamond/captain{
|
||||
anchored = 1;
|
||||
desc = "A statue in honour of those who rose against the tyranny of the Trans-Solar Federation in 2443.";
|
||||
icon_state = "russian";
|
||||
icon_state = "soviet";
|
||||
layer = 4;
|
||||
name = "Cygni Commemorative Statue";
|
||||
pixel_y = 16
|
||||
@@ -7400,7 +7400,7 @@
|
||||
/area/ruin/space/derelict/solar_control)
|
||||
"sv" = (
|
||||
/obj/item/gps/ruin{
|
||||
gpstag = "Russian Distress Signal"
|
||||
gpstag = "Soviet Distress Signal"
|
||||
},
|
||||
/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
@@ -7469,7 +7469,7 @@
|
||||
/obj/structure/chair/wood{
|
||||
dir = 4
|
||||
},
|
||||
/mob/living/simple_animal/hostile/russian,
|
||||
/mob/living/simple_animal/hostile/soviet,
|
||||
/turf/simulated/floor/plasteel/dark,
|
||||
/area/ruin/space/derelict/crew_quarters)
|
||||
"Ye" = (
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"R" = (
|
||||
/obj/item/salvage/ruin/russian,
|
||||
/obj/item/salvage/ruin/soviet,
|
||||
/turf/simulated/floor/plating/airless,
|
||||
/area/ruin/space/derelict/teleporter)
|
||||
"U" = (
|
||||
|
||||
@@ -175,7 +175,7 @@ SUBSYSTEM_DEF(mapping)
|
||||
/obj/item/salvage/ruin/carp,
|
||||
/obj/item/salvage/ruin/tablet,
|
||||
/obj/item/salvage/ruin/pirate,
|
||||
/obj/item/salvage/ruin/russian
|
||||
/obj/item/salvage/ruin/soviet
|
||||
)
|
||||
|
||||
for(var/z_level in space_z_levels)
|
||||
|
||||
@@ -212,8 +212,8 @@
|
||||
/datum/map_template/ruin/space/dj
|
||||
id = "dj"
|
||||
suffix = "dj.dmm"
|
||||
name = "Russian DJ Station"
|
||||
description = "An old russian listening station, long since defunct and lifeless, however the equipment is likely still in working condition."
|
||||
name = "Soviet DJ Station"
|
||||
description = "An old soviet era listening station, long since defunct and lifeless, however the equipment is likely still in working condition."
|
||||
cost = 2
|
||||
|
||||
/datum/map_template/ruin/space/druglab
|
||||
@@ -249,7 +249,7 @@
|
||||
id = "ussp"
|
||||
suffix = "ussp.dmm"
|
||||
name = "USSP"
|
||||
description = "A decript station of seemingly russian origin. The last contact had with this station was a distress signal, and the rest was dark."
|
||||
description = "A decript station of seemingly Soviet origin. The last contact had with this station was a distress signal, and the rest was dark."
|
||||
allow_duplicates = FALSE // One of these has enough loot
|
||||
cost = 5 // This ruin is 100x100 tiles, so we dont want it to be treated like a 10x10 meteor
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
icon_state = "barrel"
|
||||
color = "#7e5c00" // So that it's slightly different from normal kegs
|
||||
|
||||
/obj/item/salvage/ruin/russian
|
||||
/obj/item/salvage/ruin/soviet
|
||||
name = "armaments cache"
|
||||
desc = "A crate of old disused Belastrav ballistic firearms that have been weathered into uselessness. They still may be of value to collectors, however."
|
||||
icon_state = "weapon_crate"
|
||||
@@ -85,7 +85,7 @@
|
||||
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
|
||||
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
|
||||
|
||||
/obj/item/salvage/loot/russian
|
||||
/obj/item/salvage/loot/soviet
|
||||
name = "\improper Cygni manifesto"
|
||||
desc = "A small book, written in Neo-Russkyia, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Banned in Federation space, it may fetch a decent price on the black market."
|
||||
icon_state = "ussp_manual"
|
||||
|
||||
@@ -38,13 +38,13 @@
|
||||
open_door_sprite = "syndicate1_door"
|
||||
anchored = FALSE
|
||||
|
||||
/obj/structure/closet/gimmick/russian
|
||||
name = "russian surplus closet"
|
||||
desc = "It's a storage unit for Russian standard-issue surplus."
|
||||
/obj/structure/closet/gimmick/soviet
|
||||
name = "soviet surplus closet"
|
||||
desc = "A storage unit for surplus USSP equipment."
|
||||
icon_state = "syndicate1"
|
||||
open_door_sprite = "syndicate1_door"
|
||||
|
||||
/obj/structure/closet/gimmick/russian/populate_contents()
|
||||
/obj/structure/closet/gimmick/soviet/populate_contents()
|
||||
new /obj/item/clothing/head/sovietsidecap(src)
|
||||
new /obj/item/clothing/head/sovietsidecap(src)
|
||||
new /obj/item/clothing/head/sovietsidecap(src)
|
||||
|
||||
@@ -308,9 +308,9 @@
|
||||
anchored = TRUE
|
||||
oreAmount = 0
|
||||
|
||||
/obj/structure/statue/russian_mulebot
|
||||
/obj/structure/statue/soviet_mulebot
|
||||
name = "OXENbot"
|
||||
desc = "Like a MULEbot, but more Russian and less functional.";
|
||||
desc = "Like a MULEbot, but more socialist and less functional.";
|
||||
icon = 'icons/obj/aibots.dmi';
|
||||
icon_state = "mulebot0";
|
||||
anchored = TRUE
|
||||
|
||||
@@ -302,11 +302,11 @@
|
||||
if(prob(80))
|
||||
new_name = "Unknown"
|
||||
hallucination_icon = 'icons/mob/simple_human.dmi'
|
||||
hallucination_icon_state = pick("arctic_skeleton", "templar", "skeleton", "russianmelee", "piratemelee", "plasma_miner_tool", "cat_butcher", "syndicate_space_sword", "syndicate_stormtrooper_sword", "zombie", "scary_clown")
|
||||
hallucination_icon_state = pick("arctic_skeleton", "templar", "skeleton", "sovietmelee", "piratemelee", "plasma_miner_tool", "cat_butcher", "syndicate_space_sword", "syndicate_stormtrooper_sword", "zombie", "scary_clown")
|
||||
|
||||
// Adjust the attack verb and sound depending on the "mob"
|
||||
switch(hallucination_icon_state)
|
||||
if("arctic_skeleton", "templar", "russianmelee", "plasma_miner_tool")
|
||||
if("arctic_skeleton", "templar", "sovietmelee", "plasma_miner_tool")
|
||||
attack_verb = "slashed"
|
||||
attack_sound = 'sound/weapons/bladeslice.ogg'
|
||||
if("cat_butcher")
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(slot == SLOT_HUD_HEAD)
|
||||
style.teach(H, TRUE)
|
||||
H.faction |= "russian" // Russian Hardbass Begins
|
||||
H.faction |= "soviet"
|
||||
H.physiology.stun_mod *= 0.80
|
||||
ADD_TRAIT(H, TRAIT_RESISTHEAT, "bearserk")
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(H.get_item_by_slot(SLOT_HUD_HEAD) == src)
|
||||
style.remove(H)
|
||||
H.faction -= "russian" // Hardbass stops
|
||||
H.faction -= "soviet" //
|
||||
H.physiology.stun_mod /= 0.80
|
||||
REMOVE_TRAIT (H, TRAIT_RESISTHEAT, "bearserk")
|
||||
|
||||
@@ -75,4 +75,4 @@
|
||||
. = ..()
|
||||
if(isAntag(user))
|
||||
. += "<span class='warning'>Wearing this armored pelt grants you the strength of the space bear. \
|
||||
It also makes wild bears and Russians neutral towards you.</span>"
|
||||
It also makes wild bears and wild communists neutral towards you.</span>"
|
||||
|
||||
@@ -93,25 +93,25 @@
|
||||
name = "Corpse of a Pirate Gunner"
|
||||
|
||||
|
||||
/obj/effect/mob_spawn/human/corpse/russian
|
||||
name = "Russian"
|
||||
mob_name = "Russian"
|
||||
/obj/effect/mob_spawn/human/corpse/soviet
|
||||
name = "Soviet"
|
||||
mob_name = "Soviet"
|
||||
hair_style = "bald"
|
||||
facial_hair_style = "shaved"
|
||||
outfit = /datum/outfit/russiancorpse
|
||||
outfit = /datum/outfit/sovietcorpse
|
||||
|
||||
/datum/outfit/russiancorpse
|
||||
name = "Corpse of a Russian"
|
||||
/datum/outfit/sovietcorpse
|
||||
name = "Corpse of a Soviet"
|
||||
uniform = /obj/item/clothing/under/costume/soviet
|
||||
shoes = /obj/item/clothing/shoes/jackboots
|
||||
head = /obj/item/clothing/head/bearpelt
|
||||
|
||||
|
||||
/obj/effect/mob_spawn/human/corpse/russian/ranged
|
||||
outfit = /datum/outfit/russiancorpse/ranged
|
||||
/obj/effect/mob_spawn/human/corpse/soviet/ranged
|
||||
outfit = /datum/outfit/sovietcorpse/ranged
|
||||
|
||||
/datum/outfit/russiancorpse/ranged
|
||||
name = "Corpse of a Ranged Russian"
|
||||
/datum/outfit/sovietcorpse/ranged
|
||||
name = "Corpse of a Ranged Soviet"
|
||||
head = /obj/item/clothing/head/ushanka
|
||||
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
|
||||
minbodytemp = 0
|
||||
|
||||
faction = list("russian")
|
||||
faction = list("soviet")
|
||||
gold_core_spawnable = HOSTILE_SPAWN
|
||||
footstep_type = FOOTSTEP_MOB_CLAW
|
||||
|
||||
|
||||
+17
-17
@@ -1,11 +1,11 @@
|
||||
/mob/living/simple_animal/hostile/russian
|
||||
name = "Russian"
|
||||
desc = "For the Motherland!"
|
||||
/mob/living/simple_animal/hostile/soviet
|
||||
name = "Soviet"
|
||||
desc = "For the Union!"
|
||||
icon = 'icons/mob/simple_human.dmi'
|
||||
icon_state = "russianmelee"
|
||||
icon_living = "russianmelee"
|
||||
icon_dead = "russianmelee_dead" // Does not actually exist. del_on_death.
|
||||
icon_gib = "russianmelee_gib" // Does not actually exist. del_on_death.
|
||||
icon_state = "sovietmelee"
|
||||
icon_living = "sovietmelee"
|
||||
icon_dead = "sovietmelee_dead" // Does not actually exist. del_on_death.
|
||||
icon_gib = "sovietmelee_gib" // Does not actually exist. del_on_death.
|
||||
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
|
||||
speak_chance = 0
|
||||
turns_per_move = 5
|
||||
@@ -22,27 +22,27 @@
|
||||
attack_sound = 'sound/weapons/punch1.ogg'
|
||||
a_intent = INTENT_HARM
|
||||
unsuitable_atmos_damage = 15
|
||||
faction = list("russian")
|
||||
faction = list("soviet")
|
||||
status_flags = CANPUSH
|
||||
loot = list(/obj/effect/mob_spawn/human/corpse/russian,
|
||||
loot = list(/obj/effect/mob_spawn/human/corpse/soviet,
|
||||
/obj/item/kitchen/knife,
|
||||
/obj/item/salvage/loot/russian)
|
||||
/obj/item/salvage/loot/soviet)
|
||||
del_on_death = TRUE
|
||||
sentience_type = SENTIENCE_OTHER
|
||||
footstep_type = FOOTSTEP_MOB_SHOE
|
||||
|
||||
/mob/living/simple_animal/hostile/russian/ranged
|
||||
icon_state = "russianranged"
|
||||
icon_living = "russianranged"
|
||||
/mob/living/simple_animal/hostile/soviet/ranged
|
||||
icon_state = "sovietranged"
|
||||
icon_living = "sovietranged"
|
||||
ranged = TRUE
|
||||
retreat_distance = 5
|
||||
minimum_distance = 5
|
||||
projectilesound = 'sound/weapons/gunshots/gunshot.ogg'
|
||||
casingtype = /obj/item/ammo_casing/a357
|
||||
loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged, /obj/item/gun/projectile/revolver/mateba)
|
||||
loot = list(/obj/effect/mob_spawn/human/corpse/soviet/ranged, /obj/item/gun/projectile/revolver/mateba)
|
||||
|
||||
/mob/living/simple_animal/hostile/russian/ranged/mosin
|
||||
loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged,
|
||||
/mob/living/simple_animal/hostile/soviet/ranged/mosin
|
||||
loot = list(/obj/effect/mob_spawn/human/corpse/soviet/ranged,
|
||||
/obj/item/gun/projectile/shotgun/boltaction,
|
||||
/obj/item/salvage/loot/russian)
|
||||
/obj/item/salvage/loot/soviet)
|
||||
casingtype = /obj/item/ammo_casing/a762
|
||||
@@ -651,11 +651,11 @@
|
||||
name = "Teleporter Instructions"
|
||||
info = "<h3>Teleporter Instruction</h3><hr><ol><li>Install circuit board, glass and wiring to complete Teleporter Control Console</li><li>Use a screwdriver, wirecutter and screwdriver again on the Teleporter Station to connect it</li><li>Set destination with Teleporter Control Computer</li><li>Activate Teleporter Hub with Teleporter Station</li></ol>"
|
||||
|
||||
/obj/item/paper/russiantraitorobj
|
||||
/obj/item/paper/soviettraitorobj
|
||||
name = "paper- 'Mission Objectives'"
|
||||
info = "The Syndicate have cunningly disguised a Syndicate Uplink as your PDA. Simply enter the code \"678 Bravo\" into the ringtone select to unlock its hidden features. <br><br><b>Objective #1</b>. Kill the God damn AI in a fire blast that it rocks the station. <b>Success!</b> <br><b>Objective #2</b>. Escape alive. <b>Failed.</b>"
|
||||
|
||||
/obj/item/paper/russiannuclearoperativeobj
|
||||
/obj/item/paper/sovietnuclearoperativeobj
|
||||
name = "paper- 'Objectives of a Nuclear Operative'"
|
||||
info = "<b>Objective #1</b>: Destroy the station with a nuclear device."
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
//APS Pistol//
|
||||
/obj/item/gun/projectile/automatic/pistol/APS
|
||||
name = "stechkin APS pistol"
|
||||
desc = "The original russian version of a widely used Syndicate sidearm. Uses 10mm ammo."
|
||||
desc = "A deadly automatic pistol produced by the USSP's State Armory. Uses 10mm ammo."
|
||||
icon_state = "aps"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
origin_tech = "combat=3;materials=2;syndicate=3"
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
|
||||
/obj/item/gun/projectile/revolver/mateba
|
||||
name = "\improper Unica 6 auto-revolver"
|
||||
desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo." //>10mm hole >.357
|
||||
desc = "A retro high-powered autorevolver typically used by officers of several unrelated militaries. Uses .357 ammo." //>10mm hole >.357
|
||||
icon_state = "mateba"
|
||||
|
||||
/obj/item/gun/projectile/revolver/golden
|
||||
|
||||
+1
-1
@@ -2399,7 +2399,7 @@
|
||||
#include "code\modules\mob\living\simple_animal\hostile\mushroom.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\netherworld.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\soviet.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\skeleton_mob.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\syndicate_mobs.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\tree.dm"
|
||||
|
||||
Reference in New Issue
Block a user