[PORT] Metallic hydrogen armor and helmet from tg (#14619)

* Add atmos armor and helmet

* buffed a bit

* Fixes??

* Added item icons

* Makes so that you can upgrade normal helmet and armor to metallic hydrogen

* Reduce spessmen speed when wearing metal hydrogen armor

* Changes some shit

* Added bounty for atmos helmet and armor

* changes

* e

* A

* g

* Att

* This should do

* Last commit

* i was kidding this is last

* Revert "i was kidding this is last"

This reverts commit db4359a99f.

* I swear this is last

* i swear this is my last commit

* maybe too much

* Changes some texts

* Balacnes hydrogen armor and helmet

* Turns atmos armor and helmet to normal state, Makes new atmos hardsuit with capable of protecting user from rad, fire, pressure with slowdown of 0.33(same as riot suit)

* fixes

* meh

* Req more hydrogen to make hardsuit

* Makes more requirement for Hydrogen atmos hardsuit

* Fixes

* Maybe not the great idea

* .
This commit is contained in:
Bop
2022-07-09 19:42:02 +07:00
committed by GitHub
parent 21cd15c961
commit 39bf78b831
11 changed files with 92 additions and 4 deletions

View File

@@ -363,6 +363,18 @@
category = CAT_APPAREL
subcategory = CAT_ARMOR
/datum/crafting_recipe/hydrogen_hardsuit
name = "Metallic Hydrogen Elder Atmosian Hardsuit"
result = /obj/item/clothing/suit/space/hardsuit/elder_atmosian
time = 10 SECONDS
reqs = list(/obj/item/clothing/suit/armor/elder_atmosian = 1,
/obj/item/clothing/head/helmet/elder_atmosian = 1,
/obj/item/clothing/head/hardhat/atmos = 1,
/obj/item/clothing/suit/fire/atmos = 1,
/obj/item/stack/sheet/mineral/diamond = 5,
/obj/item/stack/sheet/mineral/metal_hydrogen = 10)
category = CAT_APPAREL
subcategory = CAT_ARMOR
// Equipment //

View File

@@ -472,8 +472,8 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
//Metal Hydrogen
GLOBAL_LIST_INIT(metalhydrogen_recipes, list(
new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=20, res_amount=1),
//new /datum/stack_recipe("ancient armor", /obj/item/clothing/suit/armor/elder_atmosian, req_amount = 8, res_amount = 1),
//new /datum/stack_recipe("ancient helmet", /obj/item/clothing/head/helmet/elder_atmosian, req_amount = 5, res_amount = 1),
new /datum/stack_recipe("ancient armor", /obj/item/clothing/suit/armor/elder_atmosian, req_amount = 10, res_amount = 1),
new /datum/stack_recipe("ancient helmet", /obj/item/clothing/head/helmet/elder_atmosian, req_amount = 5, res_amount = 1),
new /datum/stack_recipe("metallic hydrogen axe", /obj/item/twohanded/fireaxe/metal_h2_axe, req_amount = 15, res_amount = 1),
))

View File

@@ -56,3 +56,24 @@
description = "Station 14's staff are behind schedule on important research. Ship them some Stimulum to get them back up to speed. (20 Moles)"
reward = 12000
gas_type = /datum/gas/stimulum
/datum/bounty/item/h2metal/metallic_hydrogen_armor
name = "Metallic Hydrogen Armors"
description = "Nanotrasen is requiring new armor to be made. Ship them some metallic hydrogen armors."
reward = 8000
required_count = 1
wanted_types = list(/obj/item/clothing/suit/armor/elder_atmosian)
/datum/bounty/item/h2metal/metallic_hydrogen_helmet
name = "Metallic Hydrogen Armors"
description = "Nanotrasen is requiring new helmet to be made. Ship them some metallic hydrogen helmets."
reward = 7000
required_count = 1
wanted_types = list(/obj/item/clothing/head/helmet/elder_atmosian)
/datum/bounty/item/h2metal/metallic_hydrogen_axe
name = "Metallic Hydrogen axes"
description = "Nanotrasen is requiring new axe to be made. Ship them some metallic hydrogen helmets."
reward = 7500
required_count = 3
wanted_types = list(/obj/item/twohanded/fireaxe/metal_h2_axe)

View File

@@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
// Returns a new bounty of random type, but does not add it to GLOB.bounties_list.
/proc/random_bounty()
switch(rand(1, 13))
switch(rand(1, 14))
if(1)
var/subtype = pick(subtypesof(/datum/bounty/item/assistant))
return new subtype
@@ -126,6 +126,9 @@ GLOBAL_LIST_EMPTY(bounties_list)
else
subtype = pick(subtypesof(/datum/bounty/item/atmos/complex))
return new subtype
if(14)
var/subtype = pick(subtypesof(/datum/bounty/item/h2metal))
return new subtype
// Called lazily at startup to populate GLOB.bounties_list with random bounties.
/proc/setup_bounties()
@@ -141,8 +144,9 @@ GLOBAL_LIST_EMPTY(bounties_list)
/datum/bounty/item/mining = 3,
/datum/bounty/item/medical = 2,
/datum/bounty/item/botany = 3,
/datum/bounty/item/h2metal = 3,
/datum/bounty/item/atmos/complex = 1,
/datum/bounty/item/atmos/simple = 2)
/datum/bounty/item/atmos/simple = 4)
for(var/the_type in easy_add_list_subtypes)
for(var/i in 1 to easy_add_list_subtypes[the_type])

View File

@@ -464,3 +464,16 @@
icon_state = "shamanhat"
item_state = "shamanhat"
armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 10, BOMB = 10, BIO = 5, RAD = 20, FIRE = 40, ACID = 20)
/obj/item/clothing/head/helmet/elder_atmosian
name = "\improper Elder Atmosian Helmet"
desc = "A superb helmet made with the toughest and rarest materials available to man."
icon_state = "h2helmet"
item_state = "h2helmet"
armor = list(MELEE = 35, BULLET = 30, LASER = 25, ENERGY = 30, BOMB = 20, BIO = 10, RAD = 50, FIRE = 65, ACID = 40, WOUND = 15)
flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE | HIDEHAIR
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
cold_protection = HEAD
heat_protection = HEAD
resistance_flags = FIRE_PROOF | ACID_PROOF
clothing_flags = THICKMATERIAL

View File

@@ -202,6 +202,32 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos
//Elder_Atmosian's hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/elder_atmosian
name = "Elder Atmosian Hardsuit Helmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has thermal shielding. This one is made with the toughest and rarest materials available to man."
icon_state = "hardsuit0-flight"
item_state = "flighthelmet"
hardsuit_type = "flight"
armor = list(MELEE = 40, BULLET = 35, LASER = 25, ENERGY = 30, BOMB = 100, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, WOUND = 20)
heat_protection = HEAD //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_1 = RAD_PROTECT_CONTENTS_1
/obj/item/clothing/suit/space/hardsuit/elder_atmosian
name = "Elder Atmosian Hardsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has thermal shielding. This one is made with the toughest and rarest materials available to man."
icon_state = "flightsuit"
item_state = "flightsuit"
armor = list(MELEE = 40, BULLET = 35, LASER = 25, ENERGY = 30, BOMB = 100, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, WOUND = 20)
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/elder_atmosian
jetpack = /obj/item/tank/jetpack/suit
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_1 = RAD_PROTECT_CONTENTS_1
slowdown = 0.6
//Chief Engineer's hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/engine/elite

View File

@@ -384,3 +384,15 @@
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/suit/armor/elder_atmosian
name = "\improper Elder Atmosian Armor"
desc = "A superb armor made with the toughest and rarest materials available to man."
icon_state = "h2armor"
item_state = "h2armor"
armor = list(MELEE = 35, BULLET = 30, LASER = 25, ENERGY = 25, BOMB = 85, BIO = 20, RAD = 50, FIRE = 75, ACID = 40, WOUND = 15)
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
resistance_flags = FIRE_PROOF | ACID_PROOF
clothing_flags = THICKMATERIAL

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 KiB

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 KiB

After

Width:  |  Height:  |  Size: 338 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 118 KiB