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

Merge pull request #41997 from coiax/removes-container-type

Browse Source 
Refactors `container_type` into `reagents.flags`
This commit is contained in:
Jordie
2018-12-23 16:45:10 +11:00
committed by GitHub
parent 0ff4ccaeaa 054647c382
commit c192ece1b3
54 changed files with 109 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/janicart.dm
+1 -2
View File
@@ -5,7 +5,6 @@
icon_state = "cart"
anchored = FALSE
density = TRUE
container_type = OPENCONTAINER
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
var/obj/item/storage/bag/trash/mybag = null
@@ -18,7 +17,7 @@
/obj/structure/janitorialcart/Initialize()
. = ..()
create_reagents(100)
create_reagents(100, OPENCONTAINER)
/obj/structure/janitorialcart/proc/wet_mop(obj/item/mop, mob/user)
if(reagents.total_volume < 1)
code/game/objects/structures/mop_bucket.dm
+2 -3
View File
@@ -4,13 +4,12 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "mopbucket"
density = TRUE
container_type = OPENCONTAINER
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
/obj/structure/mopbucket/Initialize()
. = ..()
create_reagents(100)
create_reagents(100, OPENCONTAINER)
/obj/structure/mopbucket/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/mop))
@@ -27,4 +26,4 @@
/obj/structure/mopbucket/update_icon()
cut_overlays()
if(reagents.total_volume > 0)
add_overlay("mopbucket_water")
add_overlay("mopbucket_water")