mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 23:48:28 +01:00
Syndicate Strike Team and Deathsquad Improvements
- SST and DS members now get advanced magboots instead of combat boots, with the SST getting ones that share a sprite with the blood-red magboots. - SST and DS members now get a fully pressurized double emergency oxygen tank, as the emergency oxygen tanks they were getting were laughably inadequate. - Filled double emergency oxygen tank is a subtype of the 1/3 filled one, so those are left unchanged. - SST space suits are now as armored and acid-proof as DS space suits. - SST space suits are now a subtype of the two specific colored Syndicate spacesuits they used, so the originals remain unchanged, as they spawn on away missions.
This commit is contained in:
@@ -174,6 +174,16 @@
|
|||||||
icon_state = "emergency_double"
|
icon_state = "emergency_double"
|
||||||
volume = 10
|
volume = 10
|
||||||
|
|
||||||
|
/obj/item/weapon/tank/emergency_oxygen/double/full
|
||||||
|
name = "pressurized double emergency oxygen tank"
|
||||||
|
desc = "Used for \"emergencies,\" it actually contains a fair amount of oxygen."
|
||||||
|
|
||||||
|
New()
|
||||||
|
..()
|
||||||
|
src.air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
|
||||||
|
src.air_contents.update_values()
|
||||||
|
return
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Nitrogen
|
* Nitrogen
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ var/global/sent_strike_team = 0
|
|||||||
equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform)
|
equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform)
|
||||||
else
|
else
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
|
equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(src), slot_shoes)
|
equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/advance(src), slot_shoes)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad(src), slot_wear_suit)
|
equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad(src), slot_wear_suit)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves)
|
equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad(src), slot_head)
|
equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad(src), slot_head)
|
||||||
@@ -153,7 +153,7 @@ var/global/sent_strike_team = 0
|
|||||||
|
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(src), slot_l_store)
|
equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(src), slot_l_store)
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/grenade/flashbang(src), slot_r_store)
|
equip_to_slot_or_del(new /obj/item/weapon/grenade/flashbang(src), slot_r_store)
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store)
|
equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(src), slot_s_store)
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(src), slot_belt)
|
equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(src), slot_belt)
|
||||||
|
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_r_hand)
|
equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_r_hand)
|
||||||
|
|||||||
@@ -133,16 +133,16 @@ var/global/sent_syndicate_strike_team = 0
|
|||||||
R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode.
|
R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode.
|
||||||
equip_to_slot_or_del(R, slot_l_ear)
|
equip_to_slot_or_del(R, slot_l_ear)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), slot_w_uniform)
|
equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), slot_w_uniform)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(src), slot_shoes)
|
equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_shoes)
|
||||||
if (!syndicate_leader_selected)
|
if (!syndicate_leader_selected)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black(src), slot_wear_suit)
|
equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/strike(src), slot_wear_suit)
|
||||||
else
|
else
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/red(src), slot_wear_suit)
|
equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/red/strike(src), slot_wear_suit)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves)
|
equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves)
|
||||||
if (!syndicate_leader_selected)
|
if (!syndicate_leader_selected)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black(src), slot_head)
|
equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/strike(src), slot_head)
|
||||||
else
|
else
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/red(src), slot_head)
|
equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/red/strike(src), slot_head)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), slot_wear_mask)
|
equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), slot_wear_mask)
|
||||||
equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
|
equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
|
||||||
|
|
||||||
@@ -161,7 +161,7 @@ var/global/sent_syndicate_strike_team = 0
|
|||||||
|
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(src), slot_l_store)
|
equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(src), slot_l_store)
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/grenade/empgrenade(src), slot_r_store)
|
equip_to_slot_or_del(new /obj/item/weapon/grenade/empgrenade(src), slot_r_store)
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store)
|
equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(src), slot_s_store)
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/m2411(src), slot_belt)
|
equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/m2411(src), slot_belt)
|
||||||
|
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_r_hand) //Will change to something different at a later time -- Superxpdude
|
equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_r_hand) //Will change to something different at a later time -- Superxpdude
|
||||||
|
|||||||
@@ -41,4 +41,9 @@
|
|||||||
desc = "Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders."
|
desc = "Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders."
|
||||||
name = "blood-red magboots"
|
name = "blood-red magboots"
|
||||||
icon_state = "syndiemag0"
|
icon_state = "syndiemag0"
|
||||||
magboot_state = "syndiemag"
|
magboot_state = "syndiemag"
|
||||||
|
|
||||||
|
obj/item/clothing/shoes/magboots/syndie/advance //For the Syndicate Strike Team
|
||||||
|
desc = "Reverse-engineered magboots that appear to be based on an advanced model, as they have a lighter magnetic pull. Property of Gorlex Marauders."
|
||||||
|
name = "advanced blood-red magboots"
|
||||||
|
slowdown_active = SHOES_SLOWDOWN
|
||||||
|
|||||||
@@ -74,11 +74,26 @@
|
|||||||
icon_state = "syndicate-helm-black"
|
icon_state = "syndicate-helm-black"
|
||||||
item_state = "syndicate-helm-black"
|
item_state = "syndicate-helm-black"
|
||||||
|
|
||||||
|
obj/item/clothing/head/helmet/space/syndicate/black/strike
|
||||||
|
name = "Syndicate Strike Team commando helmet"
|
||||||
|
desc = "A heavily armored black helmet that is only given to high-ranking Syndicate operatives."
|
||||||
|
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) //Matches DS gear.
|
||||||
|
siemens_coefficient = 0.2
|
||||||
|
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
|
||||||
|
unacidable = 1
|
||||||
|
|
||||||
/obj/item/clothing/suit/space/syndicate/black
|
/obj/item/clothing/suit/space/syndicate/black
|
||||||
name = "Black Space Suit"
|
name = "Black Space Suit"
|
||||||
icon_state = "syndicate-black"
|
icon_state = "syndicate-black"
|
||||||
item_state = "syndicate-black"
|
item_state = "syndicate-black"
|
||||||
|
|
||||||
|
obj/item/clothing/suit/space/syndicate/black/strike
|
||||||
|
name = "Syndicate Strike Team commando space suit"
|
||||||
|
desc = "A heavily armored, black space suit that is only given to high-ranking Syndicate operatives."
|
||||||
|
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) //Matches DS gear.
|
||||||
|
siemens_coefficient = 0.2
|
||||||
|
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
|
||||||
|
unacidable = 1
|
||||||
|
|
||||||
//Black-green syndicate space suit
|
//Black-green syndicate space suit
|
||||||
/obj/item/clothing/head/helmet/space/syndicate/black/green
|
/obj/item/clothing/head/helmet/space/syndicate/black/green
|
||||||
@@ -134,11 +149,27 @@
|
|||||||
icon_state = "syndicate-helm-black-red"
|
icon_state = "syndicate-helm-black-red"
|
||||||
item_state = "syndicate-helm-black-red"
|
item_state = "syndicate-helm-black-red"
|
||||||
|
|
||||||
|
obj/item/clothing/head/helmet/space/syndicate/black/red/strike
|
||||||
|
name = "Syndicate Strike Team leader helmet"
|
||||||
|
desc = "A heavily armored, black and red space helmet that is only given to elite Syndicate operatives, it looks particularly menacing."
|
||||||
|
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) //Matches DS gear.
|
||||||
|
siemens_coefficient = 0.2
|
||||||
|
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
|
||||||
|
unacidable = 1
|
||||||
|
|
||||||
/obj/item/clothing/suit/space/syndicate/black/red
|
/obj/item/clothing/suit/space/syndicate/black/red
|
||||||
name = "Black and Red Space Suit"
|
name = "Black and Red Space Suit"
|
||||||
icon_state = "syndicate-black-red"
|
icon_state = "syndicate-black-red"
|
||||||
item_state = "syndicate-black-red"
|
item_state = "syndicate-black-red"
|
||||||
|
|
||||||
|
obj/item/clothing/suit/space/syndicate/black/red/strike
|
||||||
|
name = "Syndicate Strike Team leader space suit"
|
||||||
|
desc = "A heavily armored, black and red space suit that is only given to elite Syndicate operatives, it looks particularly menacing."
|
||||||
|
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) //Matches DS gear.
|
||||||
|
siemens_coefficient = 0.2
|
||||||
|
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
|
||||||
|
unacidable = 1
|
||||||
|
|
||||||
|
|
||||||
//Black with yellow/red engineering syndicate space suit
|
//Black with yellow/red engineering syndicate space suit
|
||||||
/obj/item/clothing/head/helmet/space/syndicate/black/engie
|
/obj/item/clothing/head/helmet/space/syndicate/black/engie
|
||||||
|
|||||||
Reference in New Issue
Block a user