-
Notifications
You must be signed in to change notification settings - Fork 522
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.
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
Added Nitrile box, works like paper bin #9356
Conversation
You can just remove the stuff that tracks a list of papers - It only matters because papers can be different from each other, your gloves are all the same. |
TIP : type !wip in a separate comment, or else the bot won't be able to label it correctly. Also, I suggest changing the box color from green to white to match the rest of medical. |
Thanks! Changes applied. I'll make sure to add those tags next time! (Alsoandanswer, I used your guide in the course of making that sprite, thank you!) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nothing major to change. But my suggestions are useful things to know if you plan on contributing more. 👍
amount-- | ||
var/obj/item/clothing/gloves/latex/nitrile/P | ||
if(response == "Yes") | ||
P = new /obj/item/clothing/gloves/latex/nitrile |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you already defined the type of P on line 49, you don't need to supply it here.
P = new /obj/item/clothing/gloves/latex/nitrile | |
P = new() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Alternatively you can delete line 49 and keep line 51 the same.
if (H.hand) | ||
temp = H.organs_by_name[BP_L_HAND] | ||
if(temp && !temp.is_usable()) | ||
to_chat(user, "<span class='notice'>You try to move your [temp.name], but cannot!</span>") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're using SPAN macros now, these work like this:
to_chat(user, "<span class='notice'>You try to move your [temp.name], but cannot!</span>") | |
to_chat(user, SPAN_NOTICE("You try to move your [temp.name], but cannot!")) |
They're defined for all the span classes used in this file, in _macros.dm if you want to look at them.
layer = OBJ_LAYER - 0.1 | ||
var/amount = 50 //How much paper is in the bin. Gloves, actually, but this code is copied from the paper bin code. | ||
|
||
/obj/item/nitrilebox/MouseDrop(mob/user as mob) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/obj/item/nitrilebox/MouseDrop(mob/user as mob) | |
/obj/item/nitrilebox/MouseDrop(mob/user) |
as mob
is redundant here, because mob/user
already does this. Also in other places, as obj
too.
return | ||
amount-- | ||
var/obj/item/clothing/gloves/latex/nitrile/P | ||
if(response == "Yes") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if(response == "Yes") |
This line does nothing, because if you get false for the If statement on line 45, response must equal "Yes"
user.put_in_hands(P) | ||
to_chat(user, "<span class='notice'>You take [P] out of the [src].</span>") | ||
else | ||
to_chat(user, "<span class='notice'>[src] is empty!</span>") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to_chat(user, "<span class='notice'>[src] is empty!</span>") | |
to_chat(user, SPAN_NOTICE("\The [src] is empty!")) |
Putting in \The
or \the
before a reference to a variable, like [src]
will automatically put in "the" if it is grammatically correct for whatever [src]
resolves into.
|
||
P.forceMove(user.loc) | ||
user.put_in_hands(P) | ||
to_chat(user, "<span class='notice'>You take [P] out of the [src].</span>") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to_chat(user, "<span class='notice'>You take [P] out of the [src].</span>") | |
to_chat(user, SPAN_NOTICE("You take \the [P] out of \the [src].")) |
!review Hopefully I didn't leave anything messed up. If y'all like I can make one for latex gloves too. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You most likely didnt use tgs for the mapping changes.
Please ensure to do so.
6334489
to
076e5d0
Compare
076e5d0
to
fd558c9
Compare
I helped @FirinMaLazors untangle things. Please re-review. |
Added a nitrile gloves box, and sprite, based on the paper bin. Left the custom papers code in, since I wasn't sure how to change it.
!wip
IC changelog
'ZengHu Pharmaceuticals has stepped up to the plate in the fight against medical supply shortages once again. Previously, nitrile gloves were only available in travel packs of ten, but for the first time in several years, they are now available in packs of one hundred - fifty pairs each. Clever design also means errant patients won't put used gloves back in the pack.'