cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove sandstorm edit, fix suit storage

Browse Source
This commit is contained in:
Jerry Wester
2022-12-11 20:45:46 -07:00
parent 7bbed1410b
commit dae5190941
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/datums/outfit.dm
View File

@@ -184,25 +184,13 @@
if(neck)
H.equip_to_slot_or_del(new neck(H), ITEM_SLOT_NECK, TRUE)
if(ears)
H.equip_to_slot_or_del(new ears(H), ITEM_SLOT_EARS_LEFT, TRUE) // Sandstorm edit
H.equip_to_slot_or_del(new ears(H), ITEM_SLOT_EARS, TRUE)
if(glasses)
H.equip_to_slot_or_del(new glasses(H), ITEM_SLOT_EYES, TRUE)
if(id)
H.equip_to_slot_or_del(new id(H), ITEM_SLOT_ID, TRUE)
if(suit_store)
H.equip_to_slot_or_del(new suit_store(H), ITEM_SLOT_SUITSTORE, TRUE)
// Sandstorm edit
if(ears_extra)
H.equip_to_slot_or_del(new ears_extra(H), ITEM_SLOT_EARS_RIGHT, TRUE)
if(underwear)
H.equip_to_slot_or_del(new underwear(H), ITEM_SLOT_UNDERWEAR, TRUE)
if(socks)
H.equip_to_slot_or_del(new socks(H), ITEM_SLOT_SOCKS, TRUE)
if(shirt)
H.equip_to_slot_or_del(new shirt(H), ITEM_SLOT_SHIRT, TRUE)
if(wrists)
H.equip_to_slot_or_del(new wrists(H), ITEM_SLOT_WRISTS, TRUE)
//
if(accessory)
var/obj/item/clothing/under/U = H.w_uniform

8
code/game/machinery/suit_storage_unit.dm
View File

@@ -499,6 +499,10 @@
data["mask"] = mask.name
else
data["mask"] = null
if(mod)
data["mod"] = mod.name
else
data["mod"] = null
if(storage)
data["storage"] = storage.name
else
@@ -529,7 +533,7 @@
if("uv")
if(occupant && safeties)
return
else if(!helmet && !mask && !suit && !storage && !occupant)
else if(!helmet && !mask && !mod && !suit && !storage && !occupant)
return
else
if(occupant)
@@ -541,7 +545,7 @@
if(!state_open)
return
var/static/list/valid_items = list("helmet", "suit", "mask", "storage")
var/static/list/valid_items = list("helmet", "suit", "mask", "mod", "storage")
var/item_name = params["item"]
if(item_name in valid_items)
var/obj/item/I = vars[item_name]

10
tgui/packages/tgui/interfaces/SuitStorageUnit.js
View File

@@ -14,6 +14,7 @@ export const SuitStorageUnit = (props, context) => {
suit,
helmet,
mask,
mod,
storage,
} = data;
return (
@@ -89,6 +90,15 @@ export const SuitStorageUnit = (props, context) => {
item: 'mask',
})} />
</LabeledList.Item>
<LabeledList.Item label="MOD">
<Button
icon={mod ? 'square' : 'square-o'}
content={mod || 'Empty'}
disabled={!mod}
onClick={() => act('dispense', {
item: 'mod',
})} />
</LabeledList.Item>
<LabeledList.Item label="Storage">
<Button
icon={storage ? 'square' : 'square-o'}