Skip to content

Fixing few compilation errors on 515.1646 #9333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing few compilation errors on 515.1646 #9333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
368caf5
Fixing "expected a constant number"
SpaghettiTerrible Nov 8, 2024
f173b02
Update bedsheet_bin.dm
SpaghettiTerrible Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions code/game/objects/structures/bedsheet_bin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ LINEN BINS
icon_state = "linenbin-full"
anchored = 1
var/amount = 20
var/max_amount = 20
var/list/sheets = list()
var/obj/item/hidden = null

Expand All @@ -183,10 +184,12 @@ LINEN BINS
. += "There are [amount] bed sheets in the bin."

/obj/structure/bedsheetbin/update_icon()
switch(amount)
if(0) icon_state = "linenbin-empty"
if(1 to amount / 2) icon_state = "linenbin-half"
else icon_state = "linenbin-full"
if(amount < 1)
icon_state = "linenbin-empty"
else if(amount <= (max_amount/2))
icon_state = "linenbin-half"
else
icon_state = "linenbin-full"


/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob)
Expand All @@ -196,11 +199,13 @@ LINEN BINS
sheets.Add(I)
amount++
to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
update_icon()
else if(amount && !hidden && I.w_class < ITEMSIZE_LARGE) //make sure there's sheets to hide it among, make sure nothing else is hidden in there.
user.drop_item()
I.loc = src
hidden = I
to_chat(user, "<span class='notice'>You hide [I] among the sheets.</span>")
update_icon()

/obj/structure/bedsheetbin/attack_hand(mob/user as mob)
if(amount >= 1)
Expand All @@ -217,10 +222,12 @@ LINEN BINS
B.loc = user.loc
user.put_in_hands(B)
to_chat(user, "<span class='notice'>You take [B] out of [src].</span>")
update_icon()

if(hidden)
hidden.loc = user.loc
to_chat(user, "<span class='notice'>[hidden] falls out of [B]!</span>")
update_icon()
hidden = null


Expand Down
7 changes: 4 additions & 3 deletions code/modules/mob/living/silicon/robot/life.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,11 @@
src.healths.icon_state = "health3"
if(0 to 50)
src.healths.icon_state = "health4"
if(config.health_threshold_dead to 0)
src.healths.icon_state = "health5"
else
src.healths.icon_state = "health6"
if(health <= config.health_threshold_dead)
src.healths.icon_state = "health5"
else
src.healths.icon_state = "health6"
else
src.healths.icon_state = "health7"

Expand Down
Loading