cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduces the presence of contractors in some departments (#8653)

Browse Source 
And adds Zavodskoi.
This commit is contained in:
Alberyk
2020-05-13 19:12:14 +02:00
committed by GitHub
parent 50eae4ecbb
commit c328c808b5
34 changed files with 246 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/asset_cache.dm
+2 -2
View File
@@ -189,7 +189,7 @@ var/list/asset_datums = list()
"zhlogo.png" = 'html/images/zhlogo.png',
"idrislogo.png" = 'html/images/idrislogo.png',
"eridanilogo.png" = 'html/images/eridanilogo.png',
"necrologo.png" = 'html/images/necrologo.png',
"zavodlogo.png" = 'html/images/zavodlogo.png',
"hplogo.png" = 'html/images/hplogo.png',
"belogo.png" = 'html/images/belogo.png'
)
@@ -229,7 +229,7 @@ var/list/asset_datums = list()
assets = list(
"faction_EPMC.png" = 'icons/misc/factions/ECFlogo.png',
"faction_Zeng.png" = 'icons/misc/factions/ZhenHulogo.png',
"faction_Necro.png" = 'icons/misc/factions/NecroInclogo.png',
"faction_Zavod.png" = 'icons/misc/factions/Zavodlogo.png',
"faction_NT.png" = 'icons/misc/factions/NanoTrasenlogo.png',
"faction_Idris.png" = 'icons/misc/factions/Idrislogo.png',
"faction_Hepht.png" = 'icons/misc/factions/Hephaestuslogo.png',
code/modules/client/preference_setup/loadout/loadout_factions.dm
+29 -29
View File
@@ -18,33 +18,33 @@
slot = slot_wear_suit
faction = "Idris Incorporated"
/datum/gear/faction/necro_beret
display_name = "brown necropolis beret"
path = /obj/item/clothing/head/beret/sec/necro
faction = "Necropolis Industries"
/datum/gear/faction/zavodskoi_beret
display_name = "brown zavodskoi beret"
path = /obj/item/clothing/head/beret/sec/zavodskoi
faction = "Zavodskoi Interstellar"
/datum/gear/faction/necro_beret/alt
display_name = "black necropolis beret"
path = /obj/item/clothing/head/beret/sec/necro/alt
/datum/gear/faction/zavodskoi_beret/alt
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/sec/zavodskoi/alt
sort_category = "Factions"
/datum/gear/faction/necro_uniform_alt
display_name = "brown necropolis uniform"
path = /obj/item/clothing/under/rank/security/necropolis/alt
/datum/gear/faction/zavodskoi_uniform_alt
display_name = "brown zavodskoi uniform"
path = /obj/item/clothing/under/rank/security/zavodskoi/alt
slot = slot_wear_suit
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
/datum/gear/faction/necro_research_alt
display_name = "brown necropolis research uniform"
path = /obj/item/clothing/under/rank/necropolis/research/alt
/datum/gear/faction/zavodskoi_research_alt
display_name = "brown zavodskoi research uniform"
path = /obj/item/clothing/under/rank/zavodskoi/research/alt
slot = slot_wear_suit
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
/datum/gear/faction/necro_labcoat
display_name = "necropolis labcoat"
path = /obj/item/clothing/suit/storage/toggle/labcoat/necro
/datum/gear/faction/zavodskoi_labcoat
display_name = "zavodskoi labcoat"
path = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi
slot = slot_wear_suit
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
/datum/gear/faction/eridani_beret
display_name = "eridani beret"
@@ -68,25 +68,25 @@
display_name = "white zeng-hu beret"
path = /obj/item/clothing/head/beret/zeng/alt
slot = slot_head
faction = "Zeng-Hu Pharmaceuticals"
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_labcoat
display_name = "zeng-hu labcoat"
path = /obj/item/clothing/suit/storage/toggle/labcoat/zeng
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/necro_patch
display_name = "necropolis sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/necro
/datum/gear/faction/zavodskoi_patch
display_name = "zavodskoi sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoi
slot = slot_tie
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
/datum/gear/faction/necrosec_patch
display_name = "necropolis security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/necrosec
/datum/gear/faction/zavodskoisec_patch
display_name = "zavodskoi security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoisec
slot = slot_tie
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
allowed_roles = list("Security Officer","Forensic Technician","Warden")
/datum/gear/faction/erisec_patch
code/modules/clothing/head/jobs.dm
+7 -7
View File
@@ -67,14 +67,14 @@
desc = "A beret with the Idris Incorporated insignia emblazoned on it."
icon_state = "idrissecberet"
/obj/item/clothing/head/beret/sec/necro
name = "necropolis security beret"
desc = "A brown beret with the Necropolis Industries insignia emblazoned on it."
/obj/item/clothing/head/beret/sec/zavodskoi
name = "zavodskoi interstellar security beret"
desc = "A brown beret with the Zavodskoi Interstellar insignia emblazoned on it."
icon_state = "necrosecberet"
/obj/item/clothing/head/beret/sec/necro/alt
name = "necropolis security beret"
desc = "A black beret with the Necropolis Industries insignia emblazoned on it."
/obj/item/clothing/head/beret/sec/zavodskoi/alt
name = "zavodskoi interstellar security beret"
desc = "A black beret with the Zavodskoi Interstellar insignia emblazoned on it."
icon_state = "necrosecaltberet"
/obj/item/clothing/head/beret/sec/eri
@@ -115,7 +115,7 @@
/obj/item/clothing/head/beret/zeng/alt
name = "zeng-hu beret"
desc = "A white beret with the Zeng-Hu insignia emblazoned on it."
icon_state = "zengaltberet"
icon_state = "zengaltberet"
/obj/item/clothing/head/beret/heph
name = "hephaestus beret"
code/modules/clothing/spacesuits/void/misc.dm
+6 -6
View File
@@ -220,8 +220,8 @@
description_fluff = "An easily recognized Hephaestus terraforming suit. Used often on jungle worlds to handle local wildlife and safely deforest areas in hostile environments. It found recent popularity due to its combat effectiveness that resulted in its proliferation in the hands of Hephaestus private military."
refittable = FALSE
//Necropolis Industries espionage voidsuit
/obj/item/clothing/head/helmet/space/void/necropolis
//Zavodskoi Interstellar espionage voidsuit
/obj/item/clothing/head/helmet/space/void/zavodskoi
name = "revenant suit helmet"
desc = "A scary-looking helmet with blood red optics."
icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
@@ -235,11 +235,11 @@
light_overlay = "helmet_light_revenant"
brightness_on = 6
light_color = "#f65858"
description_fluff = "An ominous helmet of Necropolis make with its past veiled in mystery, used for high-end corporate backstabbing and secret operations."
description_fluff = "An ominous helmet of Zavodskoi Interstellar make with its past veiled in mystery, used for high-end corporate backstabbing and secret operations."
/obj/item/clothing/suit/space/void/necropolis
/obj/item/clothing/suit/space/void/zavodskoi
name = "revenant combat suit"
desc = "A robust skirmishing suit with lightweight plating. It is branded with Kumar Arms logos, a subsidiary of Necropolis Industries. It looks very portable."
desc = "A robust skirmishing suit with lightweight plating. It is branded with Kumar Arms logos, a subsidiary of Zavodskoi Interstellar. It looks very portable."
icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
icon_state = "revenant"
item_state = "revenant"
@@ -250,7 +250,7 @@
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
species_restricted = list("Human")
description_fluff = "A portable, sleek combat suit utilized in excess by Necropolis private military contractors. It is known to be utilized by the company's most secretive sectors explicitly for espionage."
description_fluff = "A portable, sleek combat suit utilized in excess by Zavodskoi Interstellar private military contractors. It is known to be utilized by the company's most secretive sectors explicitly for espionage."
//Freelancer voidsuit
/obj/item/clothing/head/helmet/space/void/freelancer
code/modules/clothing/suits/labcoat.dm
+4 -5
View File
@@ -159,11 +159,11 @@
icon_state = "labcoat_zeng_open"
icon_open = "labcoat_zeng_open"
icon_closed = "labcoat_zeng"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
/obj/item/clothing/suit/storage/toggle/labcoat/necro
name = "necropolis labcoat"
desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Comes in Necropolis colours."
/obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi
name = "Zavodskoi Interstellar labcoat"
desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Comes in Zavodskoi Interstellar colours."
icon_state = "labcoat_necro_open"
icon_open = "labcoat_necro_open"
icon_closed = "labcoat_necro"
@@ -176,4 +176,3 @@
icon_open = "labcoat_heph_open"
icon_closed = "labcoat_heph"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
code/modules/clothing/under/accessories/accessory.dm
+7 -7
View File
@@ -181,7 +181,7 @@
if(user.a_intent == I_HELP)
var/obj/item/organ/organ = M.get_organ(user.zone_sel.selecting)
if(organ)
user.visible_message(span("notice", "[user] places [src] against [M]'s [organ.name] and listens attentively."),
user.visible_message(span("notice", "[user] places [src] against [M]'s [organ.name] and listens attentively."),
"You place [src] against [M]'s [organ.name]. You hear <b>[english_list(organ.listen())]</b>.")
return
return ..(M,user)
@@ -694,15 +694,15 @@
flippable = 1
drop_sound = 'sound/items/drop/gloves.ogg'
/obj/item/clothing/accessory/sleevepatch/necro
name = "\improper Necropolis Industries sleeve patch"
desc = "An embroidered patch which can be attached to the shoulder sleeve of clothing. This one bears the Necropolis Industries logo."
/obj/item/clothing/accessory/sleevepatch/zavodskoi
name = "\improper Zavodskoi Interstellar sleeve patch"
desc = "An embroidered patch which can be attached to the shoulder sleeve of clothing. This one bears the Zavodskoi Interstellar logo."
icon_state = "necro_patch"
overlay_state = "necro_patch"
/obj/item/clothing/accessory/sleevepatch/necrosec
name = "\improper Necropolis Industries Security sleeve patch"
desc = "An embroidered patch which can be attached to the shoulder sleeve of clothing. This one bears the Necropolis Industries logo with an insignia."
/obj/item/clothing/accessory/sleevepatch/zavodskoisec
name = "\improper Zavodskoi Interstellar Security sleeve patch"
desc = "An embroidered patch which can be attached to the shoulder sleeve of clothing. This one bears the Zavodskoi Interstellar logo with an insignia."
icon_state = "necrosec_patch"
overlay_state = "necrosec_patch"
code/modules/clothing/under/jobs/civilian.dm
+13 -13
View File
@@ -167,7 +167,7 @@
icon_state = "heph_engineer"
worn_state = "heph_engineer"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
siemens_coefficient = 0.75
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/hephaestus/tech
name = "Hephaestus Industries technician uniform"
@@ -181,23 +181,23 @@
icon_state = "heph_research"
worn_state = "heph_research"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 10)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 10)
/obj/item/clothing/under/rank/necropolis
name = "Necropolis Industries uniform"
desc = "A uniform worn by Necropolis Industries employees and contractors."
/obj/item/clothing/under/rank/zavodskoi
name = "Zavodskoi Interstellar uniform"
desc = "A uniform worn by Zavodskoi Interstellar employees and contractors."
icon_state = "necro"
worn_state = "necro"
/obj/item/clothing/under/rank/necropolis/research
name = "Necropolis Industries research uniform"
desc = "A uniform worn by Necropolis Industries researchers."
/obj/item/clothing/under/rank/zecropolis/research
name = "Zavodskoi Interstellar research uniform"
desc = "A uniform worn by Zavodskoi Interstellar researchers."
icon_state = "necro_research"
worn_state = "necro_research"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/under/rank/necropolis/research/alt
/obj/item/clothing/under/rank/zavodskoi/research/alt
icon_state = "necro_research_alt"
worn_state = "necro_research_alt"
@@ -221,7 +221,7 @@
icon_state = "einstein_engine"
worn_state = "einstein_engine"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
siemens_coefficient = 0.75
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/zeng
name = "Zeng-Hu uniform"
@@ -229,7 +229,7 @@
icon_state = "zeng_research"
worn_state = "zeng_research"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0)
/obj/item/clothing/under/rank/zeng/alt
icon_state = "zeng_research_alt"
@@ -247,4 +247,4 @@
icon_state = "eridani_medic"
worn_state = "eridani_medic"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
code/modules/clothing/under/jobs/security.dm
+4 -4
View File
@@ -95,13 +95,13 @@
* Contractors
*/
/obj/item/clothing/under/rank/security/necropolis
name = "Necropolis Industries security uniform"
desc = "A uniform worn by Necropolis Industries security forces."
/obj/item/clothing/under/rank/security/zavodskoi
name = "Zavodskoi Interstellar security uniform"
desc = "A uniform worn by Zavodskoi Interstellar security forces."
icon_state = "necro_sec"
worn_state = "necro_sec"
/obj/item/clothing/under/rank/security/necropolis/alt
/obj/item/clothing/under/rank/security/zavodskoi/alt
icon_state = "necro_sec_alt"
worn_state = "necro_sec_alt"
code/modules/customitems/item_defines.dm
+2 -2
View File
@@ -3145,8 +3145,8 @@ All custom items with worn sprites must follow the contained sprite system: http
body_parts_covered = UPPER_TORSO|LOWER_TORSO
contained_sprite = TRUE
/obj/item/clothing/head/helmet/fluff/oscar_helmet //Necropolis Specialist Helmet - Oscar Easter - slymantis84
name = "necropolis specialist helmet"
/obj/item/clothing/head/helmet/fluff/oscar_helmet //zavodskoi Specialist Helmet - Oscar Easter - slymantis84
name = "zavodskoi instellar specialist helmet"
desc = "A modified EPMC specialist helmet, with a built-in visor and HUD to access electronics and receive tactical information. It doesn't appear to serve many purposes in Biesel"
icon = 'icons/obj/custom_items/oscar_helmet.dmi'
icon_state = "oscar_helmet"
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -282,7 +282,7 @@
t = replacetext(t, "\[logo_zh\]", "")
t = replacetext(t, "\[logo_idris\]", "")
t = replacetext(t, "\[logo_eridani\]", "")
t = replacetext(t, "\[logo_necro\]", "")
t = replacetext(t, "\[logo_zavodskoi\]", "")
t = replacetext(t, "\[logo_hp\]", "")
t = replacetext(t, "\[logo_be\]", "")
code/modules/projectiles/guns/bang/pistol.dm
+1 -1
View File
@@ -38,7 +38,7 @@
pixel_offset_y = 13
/obj/item/gun/bang/tanto
desc = "A Necropolis Industries Tanto .40, designed to compete with the NT Mk58. Uses 10mm rounds."
desc = "A Zavodskoi Interstellar Tanto .40, designed to compete with the NT Mk58. Uses 10mm rounds."
name = "10mm pistol"
icon = 'icons/obj/guns/c05r.dmi'
icon_state = "c05r"
code/modules/projectiles/guns/bang/revolver.dm
+1 -1
View File
@@ -1,3 +1,3 @@
/obj/item/gun/bang/revolver
name = "revolver"
desc = "The classic Necropolis Industries .357 revolver, for when you only want to shoot once."
desc = "The classic Zavodskoi Interstellar .357 revolver, for when you only want to shoot once."
code/modules/projectiles/guns/projectile/automatic.dm
+3 -3
View File
@@ -71,7 +71,7 @@
/obj/item/gun/projectile/automatic/wt550
name = "machine pistol"
desc = "The NI 550 Saber is a cheap self-defense weapon, mass-produced by Necropolis Industries for paramilitary and private use. Uses 9mm rounds."
desc = "The NI 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use. Uses 9mm rounds."
icon = 'icons/obj/guns/wt550.dmi'
icon_state = "wt550"
item_state = "wt550"
@@ -149,7 +149,7 @@
/obj/item/gun/projectile/automatic/rifle/sol
name = "battle rifle"
desc = "A powerful battle rifle, the M469 is a highly accurate skirmishing firearm of Necropolis make which is chambered in 7.62."
desc = "A powerful battle rifle, the M469 is a highly accurate skirmishing firearm of Zavodskoi Instellar make which is chambered in 7.62."
icon = 'icons/obj/guns/battlerifle.dmi'
icon_state = "battlerifle"
item_state = "battlerifle"
@@ -371,7 +371,7 @@
/obj/item/gun/projectile/automatic/terminator
name = "flechette rifle"
desc = "A fearsome Necropolis Industries designed rifle with unattached bayonet that fires lethal flechette rounds."
desc = "A fearsome Zavodskoi Interstellar designed rifle with unattached bayonet that fires lethal flechette rounds."
icon = 'icons/obj/guns/flechette.dmi'
icon_state = "flechetterifle"
item_state = "flechetterifle"
code/modules/projectiles/guns/projectile/pistol.dm
+3 -3
View File
@@ -105,7 +105,7 @@
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
/obj/item/gun/projectile/tanto
desc = "A Necropolis Industries Tanto .40, designed to compete with the NT Mk58. Uses 10mm rounds."
desc = "A Zavodskoi Interstellar Tanto .40, designed to compete with the NT Mk58. Uses 10mm rounds."
name = "10mm auto-pistol"
icon = 'icons/obj/guns/c05r.dmi'
icon_state = "c05r"
@@ -219,7 +219,7 @@
/obj/item/gun/projectile/pistol
name = "9mm pistol"
desc = "A compact 9mm handgun, extremely popular all throughout human space."
description_fluff = "The Necropolis Industries Moonlight 9mm can be found in the hands of just about anyone imaginable - special operatives, common criminals, police officers, the average Joe - on account of the time-tested design, low price point, reliability, and ease of concealment. Having a threaded barrel helps, too, and it isn't uncommon to see the Moonlight as a prop in spy films, suppressed."
description_fluff = "The Zavodskoi Interstellar Moonlight 9mm can be found in the hands of just about anyone imaginable - special operatives, common criminals, police officers, the average Joe - on account of the time-tested design, low price point, reliability, and ease of concealment. Having a threaded barrel helps, too, and it isn't uncommon to see the Moonlight as a prop in spy films, suppressed."
icon = 'icons/obj/guns/pistol.dmi'
icon_state = "pistol"
item_state = "pistol"
@@ -377,7 +377,7 @@
/obj/item/gun/projectile/pistol/sol
name = "service pistol"
desc = "A very old service pistol. Branded at the grip with the old emblem of the Sol Alliance, hand-made by Necropolis."
desc = "A very old service pistol. Branded at the grip with the old emblem of the Sol Alliance, hand-made by Zavodskoi Instellar."
icon = 'icons/obj/guns/m8.dmi'
icon_state = "m8"
item_state = "m8"
code/modules/projectiles/guns/projectile/revolver.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/gun/projectile/revolver
name = "revolver"
desc = "The revised Mark II Necropolis Industries revolver, chambering .357 rounds and utilizing a robust firing mechanism to deliver deadly rounds downrange. This is a monster of a hand cannon with a beautiful cedar grip and a transparent plastic cover so as to not splinter your hands while firing."
desc = "The revised Mark II Zavodskoi Interstellar revolver, chambering .357 rounds and utilizing a robust firing mechanism to deliver deadly rounds downrange. This is a monster of a hand cannon with a beautiful cedar grip and a transparent plastic cover so as to not splinter your hands while firing."
icon = 'icons/obj/guns/revolver.dmi'
icon_state = "revolver"
item_state = "revolver"
code/modules/projectiles/guns/projectile/shotgun.dm
+1 -1
View File
@@ -107,7 +107,7 @@
/obj/item/gun/projectile/shotgun/pump/combat/sol
name = "naval shotgun"
desc = "A Malella-type 12-gauge breaching shotgun commonly found in the hands of the Sol Alliance. Made by Necropolis Industries."
desc = "A Malella-type 12-gauge breaching shotgun commonly found in the hands of the Sol Alliance. Made by Zavodskoi Interstellar."
icon = 'icons/obj/guns/malella.dmi'
icon_state = "malella"
item_state = "malella"