Updates the U.S.S.P with new looks and loadouts for admins v2 (#20669)

* Custom USSP roles for admins

* Added the sprites for new USSP

* conflict part 2

* Elder Gods please make this work

* new style for soviet box

* Added Soviet headset

* lets fix this conflict

* Die conflict!

* Sirryan review

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Lets solve this conflict

* Die conflict!

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
Henri215
2023-04-22 09:16:56 +02:00
committed by GitHub
co-authored by Ryan
parent 87de861f8f
commit 72402e782b
21 changed files with 147 additions and 38 deletions
+4
View File
@@ -834,6 +834,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
var/job_icons = get_all_job_icons()
var/centcom = get_all_centcom_jobs()
var/solgov = get_all_solgov_jobs()
var/soviet = get_all_soviet_jobs()
if((assignmentName in centcom) || (rankName in centcom)) //Return with the NT logo if it is a Centcom job
return "Centcom"
@@ -841,6 +842,9 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
if((assignmentName in solgov) || (rankName in solgov)) //Return with the SolGov logo if it is a SolGov job
return "solgov"
if((assignmentName in soviet) || (rankName in soviet)) //Return with the U.S.S.P logo if it is a Soviet job
return "soviet"
if(assignmentName in job_icons) //Check if the job has a hud icon
return assignmentName
if(rankName in job_icons)
@@ -43,6 +43,12 @@
origin_tech = "syndicate=4"
syndie = TRUE //Signifies that it de-crypts Syndicate transmissions
/obj/item/encryptionkey/soviet
name = "soviet encryption key"
icon_state = "cypherkey"
channels = list("Special Ops" = 1)
origin_tech = "syndicate=4"
/obj/item/encryptionkey/binary
name = "binary translator key"
desc = "An encryption key for a radio headset. To access the binary channel, use :+."
@@ -122,6 +122,16 @@
. = ..()
set_frequency(SYND_FREQ)
/obj/item/radio/headset/soviet
name = "soviet headset"
desc = "Used by U.S.S.P forces. Protects ears from flashbangs."
flags = EARBANGPROTECT
origin_tech = "syndicate=3"
icon_state = "soviet_headset"
item_state = "soviet_headset"
ks1type = /obj/item/encryptionkey/soviet
requires_tcomms = FALSE
/obj/item/radio/headset/binary
origin_tech = "syndicate=3"
ks1type = /obj/item/encryptionkey/binary
@@ -849,6 +849,21 @@
new /obj/item/ammo_box/a357(src)
new /obj/item/ammo_box/a357(src)
/obj/item/storage/box/soviet
name = "boxed survival kit"
desc = "A standard issue Soviet military survival kit."
icon_state = "box_soviet"
/obj/item/storage/box/soviet/populate_contents()
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/reagent_containers/hypospray/autoinjector
new /obj/item/flashlight/flare(src)
new /obj/item/crowbar/red(src)
new /obj/item/kitchen/knife/combat(src)
new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
/obj/item/storage/box/clown
name = "clown box"
desc = "A colorful cardboard box for the clown."