Skip to content
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

Merged
merged 2 commits into from
Jul 24, 2020

Conversation

FirinMaLazors
Copy link
Contributor

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.'

@BotBOREALIS BotBOREALIS added the Sprites Adds new or changes existing sprites. label Jul 14, 2020
@alsoandanswer alsoandanswer added the WIP The PR is a work in progress and should not be reviewed yet. label Jul 14, 2020
@mikomyazaki
Copy link
Contributor

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.

@alsoandanswer
Copy link
Contributor

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.

@FirinMaLazors
Copy link
Contributor Author

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!)

Copy link
Contributor

@mikomyazaki mikomyazaki left a 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
Copy link
Contributor

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.

Suggested change
P = new /obj/item/clothing/gloves/latex/nitrile
P = new()

Copy link
Contributor

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>")
Copy link
Contributor

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:

Suggested change
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)
Copy link
Contributor

@mikomyazaki mikomyazaki Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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>")
Copy link
Contributor

@mikomyazaki mikomyazaki Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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>")
Copy link
Contributor

@mikomyazaki mikomyazaki Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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]."))

@FirinMaLazors
Copy link
Contributor Author

!review

Hopefully I didn't leave anything messed up. If y'all like I can make one for latex gloves too.

@BotBOREALIS BotBOREALIS added Review Required and removed WIP The PR is a work in progress and should not be reviewed yet. labels Jul 15, 2020
@BotBOREALIS BotBOREALIS added the 🗺️ Mapping - Aurora The PR touches the Aurora map files. label Jul 18, 2020
Copy link
Member

@Arrow768 Arrow768 left a 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.

@mikomyazaki
Copy link
Contributor

I helped @FirinMaLazors untangle things. Please re-review.

@skull132 skull132 dismissed Arrow768’s stale review July 24, 2020 08:15

Seeeems to check out now.

@skull132 skull132 merged commit 513eacd into Aurorastation:master Jul 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting Merge 🗺️ Mapping - Aurora The PR touches the Aurora map files. Sprites Adds new or changes existing sprites.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants