mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 15:37:36 +01:00
updates
This commit is contained in:
S34NW
@@ -642,6 +642,121 @@
|
||||
I.assignment = "Solar Federation Representative"
|
||||
H.sec_hud_set_ID()
|
||||
|
||||
|
||||
/datum/outfit/admin/solgov
|
||||
name = "Solar Federation Marine"
|
||||
uniform = /obj/item/clothing/under/solgov
|
||||
suit = /obj/item/clothing/suit/armor/bulletproof
|
||||
back = /obj/item/storage/backpack/ert/solgov
|
||||
belt = /obj/item/storage/belt/military/assault/marines/full
|
||||
head = /obj/item/clothing/head/soft/solgov/marines
|
||||
glasses = /obj/item/clothing/glasses/night
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
shoes = /obj/item/clothing/shoes/combat
|
||||
l_ear = /obj/item/radio/headset/ert/alt/solgov
|
||||
id = /obj/item/card/id
|
||||
l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog
|
||||
suit_store = /obj/item/gun/projectile/automatic/pistol/m1911
|
||||
r_pocket = /obj/item/flashlight/seclite
|
||||
pda = /obj/item/pda
|
||||
box = /obj/item/storage/box/responseteam
|
||||
backpack_contents = list(
|
||||
/obj/item/clothing/shoes/magboots = 1,
|
||||
/obj/item/whetstone = 1,
|
||||
/obj/item/clothing/mask/gas/explorer/marines = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1
|
||||
)
|
||||
cybernetic_implants = list(
|
||||
/obj/item/organ/internal/cyberimp/arm/flash,
|
||||
/obj/item/organ/internal/cyberimp/chest/nutriment,
|
||||
/obj/item/organ/internal/cyberimp/eyes/hud/security
|
||||
)
|
||||
implants = list(/obj/item/implant/mindshield,
|
||||
/obj/item/implant/death_alarm
|
||||
)
|
||||
|
||||
var/is_solgov_lieutenant = FALSE
|
||||
|
||||
|
||||
/datum/outfit/admin/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
|
||||
. = ..()
|
||||
if(visualsOnly)
|
||||
return
|
||||
|
||||
if(is_solgov_lieutenant)
|
||||
H.real_name = "Lieutenant [pick(GLOB.last_names)]"
|
||||
else
|
||||
H.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(GLOB.last_names)]"
|
||||
H.name = H.real_name
|
||||
var/obj/item/card/id/I = H.wear_id
|
||||
I.assignment = name
|
||||
if(istype(I) && is_solgov_lieutenant)
|
||||
apply_to_card(I, H, get_centcom_access("Emergency Response Team Leader"), name, "lifetimeid")
|
||||
else if(istype(I))
|
||||
apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), name, "lifetimeid")
|
||||
H.sec_hud_set_ID()
|
||||
|
||||
/datum/outfit/admin/solgov/lieutenant
|
||||
name = "Solar Federation Lieutenant"
|
||||
uniform = /obj/item/clothing/under/solgov/command
|
||||
head = /obj/item/clothing/head/beret/solgov/command
|
||||
glasses = /obj/item/clothing/glasses/night
|
||||
back = /obj/item/storage/backpack/satchel
|
||||
l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
|
||||
l_hand = null
|
||||
belt = /obj/item/melee/baton/loaded
|
||||
suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
|
||||
l_pocket = /obj/item/pinpointer/advpinpointer
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/handcuffs = 1,
|
||||
/obj/item/clothing/shoes/magboots/advance = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
|
||||
/obj/item/clothing/mask/gas/explorer/marines = 1,
|
||||
/obj/item/ammo_box/magazine/m50 = 3
|
||||
)
|
||||
is_solgov_lieutenant = TRUE
|
||||
|
||||
/datum/outfit/admin/solgov/elite
|
||||
name = "Solar Federation Specops Marine"
|
||||
uniform = /obj/item/clothing/under/solgov/elite
|
||||
suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov
|
||||
head = null
|
||||
mask = /obj/item/clothing/mask/gas/explorer/marines
|
||||
belt = /obj/item/storage/belt/military/assault/marines/elite/full
|
||||
l_hand = /obj/item/gun/projectile/automatic/ar
|
||||
backpack_contents = list(
|
||||
/obj/item/clothing/shoes/magboots/advance = 1,
|
||||
/obj/item/whetstone = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1
|
||||
)
|
||||
cybernetic_implants = list(
|
||||
/obj/item/organ/internal/cyberimp/eyes/hud/security,
|
||||
/obj/item/organ/internal/cyberimp/chest/nutriment,
|
||||
/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
|
||||
/obj/item/organ/internal/cyberimp/arm/flash,
|
||||
/obj/item/organ/internal/eyes/cybernetic/shield
|
||||
)
|
||||
|
||||
/datum/outfit/admin/solgov/elite/lieutenant
|
||||
name = "Solar Federation Specops Lieutenant"
|
||||
uniform = /obj/item/clothing/under/solgov/command/elite
|
||||
suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command
|
||||
head = null
|
||||
mask = /obj/item/clothing/mask/gas/explorer/marines
|
||||
glasses = /obj/item/clothing/glasses/night
|
||||
belt = /obj/item/melee/baton/loaded
|
||||
l_hand = null
|
||||
suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
|
||||
l_pocket = /obj/item/pinpointer/advpinpointer
|
||||
l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/handcuffs = 1,
|
||||
/obj/item/clothing/shoes/magboots/advance = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
|
||||
/obj/item/ammo_box/magazine/m50 = 3
|
||||
)
|
||||
is_solgov_lieutenant = TRUE
|
||||
|
||||
/datum/outfit/admin/sol_trader
|
||||
name = "Sol Trader"
|
||||
|
||||
|
||||
@@ -301,22 +301,6 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE)
|
||||
/datum/response_team/gamma/announce_team()
|
||||
GLOB.event_announcement.Announce("Attention, [station_name()]. We are sending a code GAMMA elite Emergency Response Team. Standby.", "ERT En-Route")
|
||||
|
||||
/datum/response_team/solgov
|
||||
security_outfit = /datum/outfit/job/centcom/response_team/solgov
|
||||
command_outfit = /datum/outfit/job/centcom/response_team/solgov/lieutenant
|
||||
borg_path = /mob/living/silicon/robot/ert/red
|
||||
|
||||
/datum/response_team/solgov/announce_team()
|
||||
GLOB.event_announcement.Announce("Attention, [station_name()], this is the TSF-NV Aurelia. Boarding shuttles have been scrambled and marines are en-route to your location. Standby for boarding.", "Marines En-Route")
|
||||
|
||||
/datum/response_team/solgovspecops
|
||||
security_outfit = /datum/outfit/job/centcom/response_team/solgov/elite
|
||||
command_outfit = /datum/outfit/job/centcom/response_team/solgov/elite/lieutenant
|
||||
borg_path = /mob/living/silicon/robot/ert/gamma
|
||||
|
||||
/datum/response_team/solgovspecops/announce_team()
|
||||
GLOB.event_announcement.Announce("Attention, [station_name()], this is the TSF-NV Aurelia. Boarding shuttles have been scrambled and specops marines are en-route to your location. Standby for boarding.", "Marines En-Route")
|
||||
|
||||
/datum/outfit/job/centcom/response_team
|
||||
name = "Response team"
|
||||
var/rt_assignment = "Emergency Response Team Member"
|
||||
|
||||
@@ -534,128 +534,3 @@
|
||||
implants = list(/obj/item/implant/mindshield,
|
||||
/obj/item/implant/death_alarm
|
||||
)
|
||||
|
||||
//////////////////// OORAH MARINES ///////////////////
|
||||
/datum/outfit/job/centcom/response_team/solgov
|
||||
name = "Solar Federation Marine"
|
||||
rt_assignment = "Solar Federation Marine"
|
||||
rt_job = "Solar Federation Marine"
|
||||
rt_mob_job = "ERT Security"
|
||||
uniform = /obj/item/clothing/under/solgov
|
||||
suit = /obj/item/clothing/suit/armor/bulletproof
|
||||
back = /obj/item/storage/backpack/ert/solgov
|
||||
belt = /obj/item/storage/belt/military/assault/marines/full
|
||||
head = /obj/item/clothing/head/soft/solgov/marines
|
||||
glasses = /obj/item/clothing/glasses/night
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
shoes = /obj/item/clothing/shoes/combat
|
||||
l_ear = /obj/item/radio/headset/ert/alt/solgov
|
||||
id = /obj/item/card/id
|
||||
l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog
|
||||
suit_store = /obj/item/gun/projectile/automatic/pistol/m1911
|
||||
r_pocket = /obj/item/flashlight/seclite
|
||||
pda = /obj/item/pda
|
||||
backpack_contents = list(
|
||||
/obj/item/clothing/shoes/magboots = 1,
|
||||
/obj/item/whetstone = 1,
|
||||
/obj/item/clothing/mask/gas/explorer/marines = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1
|
||||
)
|
||||
cybernetic_implants = list(
|
||||
/obj/item/organ/internal/cyberimp/arm/flash,
|
||||
/obj/item/organ/internal/cyberimp/chest/nutriment,
|
||||
/obj/item/organ/internal/cyberimp/eyes/hud/security
|
||||
)
|
||||
implants = list(/obj/item/implant/mindshield,
|
||||
/obj/item/implant/death_alarm
|
||||
)
|
||||
|
||||
var/is_solgov_lieutenant = FALSE
|
||||
|
||||
|
||||
/datum/outfit/job/centcom/response_team/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
|
||||
. = ..()
|
||||
if(visualsOnly)
|
||||
return
|
||||
|
||||
if(is_solgov_lieutenant)
|
||||
H.real_name = "Lieutenant [pick(GLOB.last_names)]"
|
||||
else
|
||||
H.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(GLOB.last_names)]"
|
||||
H.name = H.real_name
|
||||
var/obj/item/card/id/I = H.wear_id
|
||||
I.assignment = name
|
||||
if(istype(I) && is_solgov_lieutenant)
|
||||
apply_to_card(I, H, get_centcom_access("Emergency Response Team Leader"), name, "lifetimeid")
|
||||
else if(istype(I))
|
||||
apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), name, "lifetimeid")
|
||||
H.sec_hud_set_ID()
|
||||
|
||||
/datum/outfit/job/centcom/response_team/solgov/lieutenant
|
||||
name = "Solar Federation Lieutenant"
|
||||
rt_assignment = "Solar Federation Lieutenant"
|
||||
rt_job = "Solar Federation Lieutenant"
|
||||
rt_mob_job = "ERT Commander"
|
||||
uniform = /obj/item/clothing/under/solgov/command
|
||||
head = /obj/item/clothing/head/beret/solgov/command
|
||||
glasses = /obj/item/clothing/glasses/night
|
||||
back = /obj/item/storage/backpack/satchel
|
||||
l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
|
||||
l_hand = null
|
||||
belt = /obj/item/melee/baton/loaded
|
||||
suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
|
||||
l_pocket = /obj/item/pinpointer/advpinpointer
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/handcuffs = 1,
|
||||
/obj/item/clothing/shoes/magboots/advance = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
|
||||
/obj/item/clothing/mask/gas/explorer/marines = 1,
|
||||
/obj/item/ammo_box/magazine/m50 = 3
|
||||
)
|
||||
is_solgov_lieutenant = TRUE
|
||||
|
||||
/datum/outfit/job/centcom/response_team/solgov/elite
|
||||
name = "Solar Federation Specops Marine"
|
||||
rt_assignment = "Solar Federation Specops Marine"
|
||||
rt_job = "Solar Federation Specops Marine"
|
||||
uniform = /obj/item/clothing/under/solgov/elite
|
||||
suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov
|
||||
head = null
|
||||
mask = /obj/item/clothing/mask/gas/explorer/marines
|
||||
belt = /obj/item/storage/belt/military/assault/marines/elite/full
|
||||
l_hand = /obj/item/gun/projectile/automatic/ar
|
||||
backpack_contents = list(
|
||||
/obj/item/clothing/shoes/magboots/advance = 1,
|
||||
/obj/item/whetstone = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1
|
||||
)
|
||||
cybernetic_implants = list(
|
||||
/obj/item/organ/internal/cyberimp/eyes/hud/security,
|
||||
/obj/item/organ/internal/cyberimp/chest/nutriment,
|
||||
/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
|
||||
/obj/item/organ/internal/cyberimp/arm/flash,
|
||||
/obj/item/organ/internal/eyes/cybernetic/shield
|
||||
)
|
||||
|
||||
/datum/outfit/job/centcom/response_team/solgov/elite/lieutenant
|
||||
name = "Solar Federation Specops Lieutenant"
|
||||
rt_assignment = "Solar Federation Specops Lieutenant"
|
||||
rt_job = "Solar Federation Specops Lieutenant"
|
||||
rt_mob_job = "ERT Commander"
|
||||
uniform = /obj/item/clothing/under/solgov/command/elite
|
||||
suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command
|
||||
head = null
|
||||
mask = /obj/item/clothing/mask/gas/explorer/marines
|
||||
glasses = /obj/item/clothing/glasses/night
|
||||
belt = /obj/item/melee/baton/loaded
|
||||
l_hand = null
|
||||
suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
|
||||
l_pocket = /obj/item/pinpointer/advpinpointer
|
||||
l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/handcuffs = 1,
|
||||
/obj/item/clothing/shoes/magboots/advance = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
|
||||
/obj/item/ammo_box/magazine/m50 = 3
|
||||
)
|
||||
is_solgov_lieutenant = TRUE
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
/datum/ui_module/ert_manager/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
|
||||
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
|
||||
if(!ui)
|
||||
ui = new(user, src, ui_key, "ERTManager", name, 350, 450, master_ui, state)
|
||||
ui = new(user, src, ui_key, "ERTManager", name, 350, 430, master_ui, state)
|
||||
ui.autoupdate = TRUE
|
||||
ui.open()
|
||||
|
||||
@@ -70,10 +70,6 @@
|
||||
D = new /datum/response_team/red
|
||||
if("Gamma")
|
||||
D = new /datum/response_team/gamma
|
||||
if("SolGov")
|
||||
D = new /datum/response_team/solgov
|
||||
if("SolGov Specops")
|
||||
D = new /datum/response_team/solgovspecops
|
||||
else
|
||||
to_chat(usr, "<span class='userdanger'>Invalid ERT type.</span>")
|
||||
return
|
||||
|
||||
@@ -33,29 +33,6 @@ export const ERTManager = (props, context) => {
|
||||
? "purple"
|
||||
: ""}
|
||||
onClick={() => act('ert_type', { ert_type: "Gamma" })} />
|
||||
<br />
|
||||
<Button
|
||||
content="SolGov"
|
||||
color={data.ert_type === "SolGov"
|
||||
? "red"
|
||||
: ""}
|
||||
onClick={() => { act('ert_type', { ert_type: "SolGov" });
|
||||
act('set_med', { set_med: "0" });
|
||||
act('set_eng', { set_eng: "0" });
|
||||
act('set_par', { set_par: "0" });
|
||||
act('set_jan', { set_jan: "0" });
|
||||
}} />
|
||||
<Button
|
||||
content="SolGov Specops"
|
||||
color={data.ert_type === "SolGov Specops"
|
||||
? "purple"
|
||||
: ""}
|
||||
onClick={() => { act('ert_type', { ert_type: "SolGov Specops" });
|
||||
act('set_med', { set_med: "0" });
|
||||
act('set_eng', { set_eng: "0" });
|
||||
act('set_par', { set_par: "0" });
|
||||
act('set_jan', { set_jan: "0" });
|
||||
}} />
|
||||
</LabeledList.Item>
|
||||
</LabeledList>
|
||||
</Section>
|
||||
@@ -82,7 +59,6 @@ export const ERTManager = (props, context) => {
|
||||
<LabeledList.Item label="Medical">
|
||||
{slotOptions.map((a, i) => (
|
||||
<Button
|
||||
disabled={data.ert_type === "SolGov" || data.ert_type === "SolGov Specops"}
|
||||
key={"med" + a}
|
||||
selected={data.med === a}
|
||||
content={a}
|
||||
@@ -95,7 +71,6 @@ export const ERTManager = (props, context) => {
|
||||
<LabeledList.Item label="Engineering">
|
||||
{slotOptions.map((a, i) => (
|
||||
<Button
|
||||
disabled={data.ert_type === "SolGov" || data.ert_type === "SolGov Specops"}
|
||||
key={"eng" + a}
|
||||
selected={data.eng === a}
|
||||
content={a}
|
||||
@@ -108,7 +83,6 @@ export const ERTManager = (props, context) => {
|
||||
<LabeledList.Item label="Paranormal">
|
||||
{slotOptions.map((a, i) => (
|
||||
<Button
|
||||
disabled={data.ert_type === "SolGov" || data.ert_type === "SolGov Specops"}
|
||||
key={"par" + a}
|
||||
selected={data.par === a}
|
||||
content={a}
|
||||
@@ -121,7 +95,6 @@ export const ERTManager = (props, context) => {
|
||||
<LabeledList.Item label="Janitor">
|
||||
{slotOptions.map((a, i) => (
|
||||
<Button
|
||||
disabled={data.ert_type === "SolGov" || data.ert_type === "SolGov Specops"}
|
||||
key={"jan" + a}
|
||||
selected={data.jan === a}
|
||||
content={a}
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user