cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds the adminspawn debug outfit (#22223)

Browse Source 
* debug outfit

* slip

* fix this

* review

* lewc review

* refactors the huds to be "not shit"
This commit is contained in:
Contrabang
2023-09-19 16:28:04 -04:00
committed by GitHub
parent 1fcf41e300
commit cedb419059
12 changed files with 346 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cash.dm
+1 -1
View File
@@ -37,7 +37,7 @@
update_icon(UPDATE_ICON_STATE)
/obj/item/stack/spacecash/update_icon_state()
name = "[amount == max_amount ? "10000" : amount] Credit[amount > 1 ? "s" : ""]"
name = "[amount] Credit[amount > 1 ? "s" : ""]"
if(amount >= 1 && amount < 10)
icon_state = "cashgreen"
else if(amount >= 10 && amount < 50)
code/game/objects/items/weapons/storage/backpack.dm
+1
View File
@@ -61,6 +61,7 @@
cant_hold = list(/obj/item/storage/backpack, /obj/item/storage/belt/bluespace)
cant_hold_override = list(/obj/item/storage/backpack/satchel_flat)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 60, ACID = 50)
allow_same_size = TRUE
/obj/item/storage/backpack/holding/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/storage/backpack/holding))
code/game/objects/items/weapons/storage/storage_base.dm
+4 -1
View File
@@ -49,6 +49,9 @@
/// Lazy list of mobs which are currently viewing the storage inventory.
var/list/mobs_viewing
// Allow storage items of the same size to be put inside
var/allow_same_size = FALSE
/obj/item/storage/Initialize(mapload)
. = ..()
can_hold = typecacheof(can_hold)
@@ -407,7 +410,7 @@
return FALSE
if(I.w_class >= w_class && isstorage(I))
if(!istype(src, /obj/item/storage/backpack/holding)) //BoHs should be able to hold backpacks again. The override for putting a BoH in a BoH is in backpack.dm.
if(!allow_same_size) //BoHs should be able to hold backpacks again. The override for putting a BoH in a BoH is in backpack.dm.
if(!stop_messages)
to_chat(usr, "<span class='warning'>[src] cannot hold [I] as it's a storage item of the same size.</span>")
return FALSE //To prevent the stacking of same sized storage items.