bugfix: language, textures, description and more for ussp ghost role (#…

…3066)

code/__DEFINES/access.dm

@@ -92,14 +92,19 @@
 #define ACCESS_CENT_BRIDGE 113//Bridge.
 #define ACCESS_CENT_COMMANDER 114//Commander's Office/ID computer.
 
-	// USSP ACCESS
+// USSP ACCESS
 #define ACCESS_USSP_TOURIST 120
 #define ACCESS_USSP_CONSCRIPT 121
 #define ACCESS_USSP_SOLDIER 122
 #define ACCESS_USSP_OFFICER 123
 #define ACCESS_USSP_MARINE 124
 #define ACCESS_USSP_MARINE_CAPTAIN 125
 #define ACCESS_USSP_MARINE_ADMIRAL 126
+#define ACCESS_USSP_MEDICAL 127
+#define ACCESS_USSP_SECURITY 128 // Ghost role 'USSP'
+#define ACCESS_USSP_COMAND 129 // Ghost role 'USSP'
+#define ACCESS_USSP_ENGINEERING 130 // Ghost role 'USSP'
+#define ACCESS_USSP_SCIENTIST 131 // Ghost role 'USSP'
 
 //The Syndicate
 #define ACCESS_SYNDICATE 150//General Syndicate Access
@@ -125,10 +130,6 @@
 
 //Awaymissions
 #define ACCESS_AWAY01 271
-#define USSP_BAR 201
-#define USSP_SECURITY 202
-#define USSP_COMAND 203
-#define USSP_ENGINEERING 204
 
 //Ghost roles
 #define ACCESS_FREE_GOLEMS 300

code/game/area/ss13_areas.dm

@@ -2271,6 +2271,48 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Derelict Arrival Centre"
 	icon_state = "yellow"
 
+/area/derelict/church
+	name = "\improper Derelict Church"
+	icon_state = "chapel"
+
+/area/derelict/common
+	name = "\improper Derelict Common Area"
+	icon_state = "crew_quarters"
+
+/area/derelict/asteroidbelt
+	name = "\improper Derelict Asteroids"
+	icon_state = "mining"
+	requires_power = FALSE
+	has_gravity = FALSE
+
+/area/derelict/med
+	name = "\improper Derelict Medbay"
+	icon_state = "medbay"
+
+/area/derelict/garden
+	name = "\improper Derelict Hydroponics"
+	icon_state = "hydro"
+
+/area/derelict/dining
+	name = "\improper Derelict Dining room"
+	icon_state = "kitchen"
+
+/area/derelict/dock
+	name = "\improper Derelict Docking Area"
+	icon_state = "ntrep"
+
+/area/derelict/security
+	name = "\improper Derelict Security Area"
+	icon_state = "blue"
+
+/area/derelict/rnd
+	name = "\improper Derelict Research Area"
+	icon_state = "purple"
+
+/area/derelict/engineer_area
+	name = "\improper Derelict Engineering Area"
+	icon_state = "engine_control"
+
 /area/derelict/storage/equipment
 	name = "Derelict Equipment Storage"
 

code/game/jobs/access.dm

@@ -453,7 +453,7 @@
 	return list("Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader","Solar Federation General")
 
 /proc/get_all_soviet_jobs()
-	return list("Soviet Tourist","Soviet Conscript","Soviet Soldier","Soviet Officer","Soviet Marine","Soviet Marine Captain","Soviet Admiral")
+	return list("Soviet Tourist","Soviet Conscript","Soviet Soldier","Soviet Officer","Soviet Marine","Soviet Marine Captain","Soviet Admiral","Soviet General","Soviet Engineer","Soviet Scientist","Soviet Medic")
 
 /proc/get_all_special_jobs()
 	return list("Special Reaction Team Member", "HONKsquad", "Clown Security")

code/game/machinery/tcomms/nttc.dm

@@ -96,7 +96,7 @@
 	/// List of SolGov Marine jobs
 	var/list/tsf_jobs = list("Solar Federation Specops Lieutenant", "Solar Federation Specops Marine", "Solar Federation Marine")
 	//  List of USSP jobs
-	var/list/soviet_jobs = list("Soviet Tourist", "Soviet Conscript", "Soviet Soldier", "Soviet Officer", "Soviet Marine", "Soviet Marine Captain")
+	var/list/soviet_jobs = list("Soviet Tourist", "Soviet Conscript", "Soviet Soldier", "Soviet Officer", "Soviet Marine", "Soviet Marine Captain", "Soviet General", "Soviet Engineer", "Soviet Scientist", "Soviet Medic")
 	// Defined so code compiles and incase someone has a non-standard job
 	var/job_class = "radio"
 	// NOW FOR ACTUAL TOGGLES

code/game/objects/items/blueprints.dm

@@ -411,3 +411,20 @@
 	popup.set_content(.)
 	popup.open()
 	onclose(usr, "blueprints")
+
+//Blueprint for USSP station
+
+/obj/item/areaeditor/ussp
+	name = "USSP Station blueprints"
+	desc = "Used to define new areas in space."
+	fluffnotice = "В случае поломки - смотри сюда"
+
+/obj/item/areaeditor/ussp/attack_self(mob/user)
+	. = ..()
+	var/area/A = get_area(user)
+	if(get_area_type() == AREA_STATION)
+		. += "<p>According to the [src], you are now in <b>\"[sanitize(A.name)]\"</b>.</p>"
+	var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500)
+	popup.set_content(.)
+	popup.open()
+	onclose(usr, "blueprints")

code/game/objects/items/trash.dm

@@ -143,3 +143,48 @@
 /obj/item/trash/broken_ashtray/Initialize(mapload)
 	. = ..()
 	icon_state = "ashtray_bork_" + pick(list("bl","br","gl"))
+
+/obj/item/spentcasing
+	icon = 'icons/obj/weapons/ammo.dmi'
+	icon_state = "gshell"
+	name = "Old bullet casing"
+	desc = "A spent bullet casing. Smells like rusty metal."
+
+	flags = CONDUCT
+	slot_flags = SLOT_BELT
+	throwforce = 1
+	w_class = WEIGHT_CLASS_TINY
+	materials = list(MAT_METAL = 100)
+
+/obj/item/spentcasing/Initialize()
+	..()
+	pixel_x = rand(-10.0, 10)
+	pixel_y = rand(-10.0, 10)
+	dir = pick(GLOB.alldirs)
+
+/obj/effect/spawner/lootdrop/spentcasing
+	name = "Old 12 gauge spent casings"
+	icon_state ="spentcasing_12"
+	lootcount = 2
+
+	loot = list(/obj/item/spentcasing)
+
+/obj/item/spentcasing/pistol
+	icon_state = "s-casing"
+
+/obj/effect/spawner/lootdrop/spentcasing/pistol
+	name = "Old pistol spent casings"
+	icon_state ="spentcasing_9"
+	lootcount = 3
+
+	loot = list(/obj/item/spentcasing/pistol)
+
+/obj/item/spentcasing/rifle
+	icon_state = "762-casing"
+
+/obj/effect/spawner/lootdrop/spentcasing/rifle
+	name = "Old rifle spent casings"
+	icon_state ="spentcasing_762"
+	lootcount = 5
+
+	loot = list(/obj/item/spentcasing/rifle)

code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm

@@ -400,6 +400,15 @@
 	qdel(stamp)
 	..()
 
+/obj/item/paper/gorky17/report
+	name = "Доклад Центральному Комитету СССП"
+	header = "<font face=\"Verdana\" color=black><center>&ZeroWidthSpace;<img src = ussplogo.png></center>"
+	info = "<font face=\"Verdana\" color=black><BR><center><B>Доклад Центральному Комитету СССП</B></center><BR>Я <B><span class=\"paper_field\"></span></B>, в звании <B><span class=\"paper_field\"></span></B> и должности <B><span class=\"paper_field\"></span></B>, докладываю: <span class=\"paper_field\"></span> <BR><BR><BR><font size = \"1\"> Подпись: <span class=\"paper_field\"></span></font><BR><font size = \"1\"> Дата: <span class=\"paper_field\"></span></font><BR><HR><font size = \"1\">*Данный факс, обязательно должен подтверждаться печатью ответственного лица. В случае наличия опечаток и отсутствия подписей или печатей, факс считается скомпрометированным.<BR>*Нарушение субординации и уставных отношений повлечет наказание.</font></font>"
+
+/obj/item/paper/gorky17/report/New()
+	. = ..()
+	populatefields()
+
 ////// CURSED TALISMAN
 /obj/item/paper/poisonedtalisman
 	info = "<font face=\"Verdana\" color=black>\

code/modules/projectiles/guns/projectile/automatic.dm

@@ -386,55 +386,3 @@
         toggle_gunlight()
         return TRUE
 
-//////////// Rusted weapons
-
-/obj/item/gun/projectile/automatic/rusted
-	name = "\improper Rusted gun"
-	desc = "An old gun, be careful using it."
-	icon_state = "aksu"
-	item_state = "aksu"
-	w_class = WEIGHT_CLASS_BULKY
-	weapon_weight = WEAPON_HEAVY
-	origin_tech = "combat=5;materials=3"
-	mag_type = /obj/item/ammo_box/magazine/aksu
-	fire_sound = 'sound/weapons/gunshots/1m90.ogg'
-	magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
-	magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
-	can_suppress = FALSE
-	can_bayonet = FALSE
-	slot_flags = SLOT_BACK
-	burst_size = 3
-	fire_delay = 1
-	recoil = 1
-	rusted_weapon = TRUE
-	self_shot_divisor = 3
-	malf_low_bound = 60
-	malf_high_bound = 90
-
-// Rusted AKSU Soviet Assault Rifle
-/obj/item/gun/projectile/automatic/rusted/aksu
-	name = "\improper Rusted AKSU assault rifle"
-	desc = "An old AK assault rifle favored by Soviet soldiers."
-	icon_state = "aksu"
-	item_state = "aksu"
-	mag_type = /obj/item/ammo_box/magazine/aksu
-	w_class = WEIGHT_CLASS_NORMAL
-	origin_tech = "combat=4;materials=3"
-	burst_size = 3
-	fire_delay = 2
-	recoil = 0.8
-
-/obj/item/gun/projectile/automatic/rusted/ppsh
-	name = "\improper Rusted PPSh submachine gun"
-	desc = "An old submachine gun favored by Soviet soldiers."
-	icon_state = "ppsh"
-	item_state = "ppsh"
-	mag_type = /obj/item/ammo_box/magazine/ppsh
-	w_class = WEIGHT_CLASS_HUGE
-	origin_tech = "combat=4;materials=3"
-	fire_sound = 'sound/weapons/gunshots/1c20.ogg'
-	self_shot_divisor = 5
-	malf_high_bound = 100
-	burst_size = 5
-	fire_delay = 1.5
-	recoil = 1.2

code/modules/projectiles/guns/rusted_weapons.dm

@@ -0,0 +1,71 @@
+// Rusted Soviet special weapons
+
+/obj/item/gun/projectile/automatic/rusted
+	name = "\improper Rusted gun"
+	desc = "An old gun, be careful using it."
+	icon_state = "aksu"
+	item_state = "aksu"
+	w_class = WEIGHT_CLASS_BULKY
+	weapon_weight = WEAPON_HEAVY
+	origin_tech = "combat=5;materials=3"
+	mag_type = /obj/item/ammo_box/magazine/aksu
+	fire_sound = 'sound/weapons/gunshots/1m90.ogg'
+	magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
+	magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
+	can_suppress = FALSE
+	can_bayonet = FALSE
+	slot_flags = SLOT_BACK
+	burst_size = 3
+	fire_delay = 1
+	recoil = 1
+	rusted_weapon = TRUE
+	self_shot_divisor = 3
+	malf_low_bound = 60
+	malf_high_bound = 90
+
+
+/obj/item/gun/projectile/automatic/rusted/aksu
+	name = "\improper Rusted AKSU assault rifle"
+	desc = "An old AK assault rifle favored by Soviet soldiers."
+	icon_state = "aksu"
+	item_state = "aksu"
+	mag_type = /obj/item/ammo_box/magazine/aksu
+	w_class = WEIGHT_CLASS_NORMAL
+	origin_tech = "combat=4;materials=3"
+	burst_size = 3
+	fire_delay = 2
+	recoil = 0.8
+
+/obj/item/gun/projectile/automatic/rusted/ppsh
+	name = "\improper Rusted PPSh submachine gun"
+	desc = "An old submachine gun favored by Soviet soldiers."
+	icon_state = "ppsh"
+	item_state = "ppsh"
+	mag_type = /obj/item/ammo_box/magazine/ppsh
+	w_class = WEIGHT_CLASS_HUGE
+	origin_tech = "combat=4;materials=3"
+	fire_sound = 'sound/weapons/gunshots/1c20.ogg'
+	self_shot_divisor = 5
+	malf_high_bound = 100
+	burst_size = 5
+	fire_delay = 1.5
+	recoil = 1.2
+
+
+//////////// Shotguns
+
+/obj/item/gun/projectile/shotgun/lethal/rusted
+	desc = "A traditional shotgun. It looks like it has been lying here for a very long time, rust is pouring."
+	rusted_weapon = TRUE
+	self_shot_divisor = 3
+	malf_low_bound = 12
+	malf_high_bound = 24
+
+//////////// Revolvers
+
+/obj/item/gun/projectile/revolver/nagant/rusted
+	desc = "An old model of revolver that originated in Russia. This one is a real relic, rust is pouring."
+	rusted_weapon = TRUE
+	self_shot_divisor = 2
+	malf_low_bound = 7
+	malf_high_bound = 21