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

Assunzione Voidsuit & Modkit Fixes (#18744)

Browse Source 
* yeah

* rad protection

* dme fuckup
This commit is contained in:
RustingWithYou
2024-03-25 20:07:43 +00:00
committed by GitHub
parent ea7e9b7513
commit e636151bb8
12 changed files with 128 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/modkit.dm
+26 -2
View File
@@ -257,7 +257,7 @@
qdel(src)
return
if(!(W.type in suit_options) && !(W.type in helmet_options))
if(!(W.type in list_values(suit_options)) && !(W.type in list_values(helmet_options)) && !(W.type in list_values(rig_options)))
return
var/voidsuit_product
@@ -266,7 +266,7 @@
voidsuit_product = suit_options[suit_choice]
else if(istype(W, /obj/item/clothing/head/helmet/space/void))
var/helmet_choice = tgui_input_list(user, "Select a helmet modification:", "Voidsuit Modkit", helmet_options)
voidsuit_product = suit_options[helmet_choice]
voidsuit_product = helmet_options[helmet_choice]
else if(istype(W, /obj/item/rig))
var/rig_choice = tgui_input_list(user, "Select a hardsuit modification:", "Voidsuit Modkit", rig_options)
voidsuit_product = rig_options[rig_choice]
@@ -366,6 +366,25 @@
"Nexus Security Hardsuit" = /obj/item/rig/nanotrasen/nexus
)
/obj/item/voidsuit_modkit_multi/coalition
name = "coalition of colonies voidsuit modkit"
suit_options = list(
"Coalition Vulture" = /obj/item/clothing/suit/space/void/coalition,
"Xanan Eagle" = /obj/item/clothing/suit/space/void/coalition/xanu,
"Gadpathurian Vulture-GP" = /obj/item/clothing/suit/space/void/coalition/gadpathur,
"Himean Buzzard" = /obj/item/clothing/suit/space/void/coalition/himeo,
"Galatean Jackdaw" = /obj/item/clothing/suit/space/void/coalition/galatea,
"Assunzionii Rook" = /obj/item/clothing/suit/space/void/coalition/assunzione
)
helmet_options = list(
"Coalition Vulture" = /obj/item/clothing/head/helmet/space/void/coalition,
"Xanan Eagle" = /obj/item/clothing/head/helmet/space/void/coalition/xanu,
"Gadpathurian Vulture-GP" = /obj/item/clothing/head/helmet/space/void/coalition/gadpathur,
"Himean Buzzard" = /obj/item/clothing/head/helmet/space/void/coalition/himeo,
"Galatean Jackdaw" = /obj/item/clothing/head/helmet/space/void/coalition/galatea,
"Assunzionii Rook" = /obj/item/clothing/head/helmet/space/void/coalition/assunzione
)
/obj/item/storage/box/unathi_pirate
name = "unathi pirate modkit box"
desc = "Contains modkits to convert Unathi pirate voidsuits into fleet variants."
@@ -381,6 +400,11 @@
desc = "Contains modkits to convert NanoTrasen hardsuits into alternate variants."
starts_with = list(/obj/item/voidsuit_modkit_multi/nanotrasen = 4)
/obj/item/storage/box/coalition
name = "coalition of colonies modkit box"
desc = "Contains modkits to convert Coalition voidsuits into member-state variants."
starts_with = list(/obj/item/voidsuit_modkit_multi/coalition = 4)
#undef MODKIT_HELMET
#undef MODKIT_SUIT
#undef MODKIT_RIG
code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+2
View File
@@ -67,6 +67,7 @@
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss/emp(src)
new /obj/item/storage/box/species_modkit(src)
new /obj/item/storage/box/coalition(src)
/obj/structure/closet/crate/secure/gear_loadout/coalition_single/fill()
new /obj/item/clothing/head/helmet/space/void/coalition(src)
@@ -78,6 +79,7 @@
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss/emp(src)
new /obj/item/device/modkit/multi_species(src)
new /obj/item/voidsuit_modkit_multi/coalition(src)
/obj/structure/closet/crate/secure/gear_loadout/eridani/fill()
new /obj/item/clothing/under/rank/security/pmc/epmc(src)