Fixed the Riot foam icon #5676
Fixed the Riot foam icon #5676
Conversation
Adds the varable riot to both normal foam darts and adds some else if statments to give both darts and modified darts the correct icon.
|
This is all...super unnecessary....can be simplified to something much better and future-proof. |
| icon_state = "foamdart_riot" | ||
| desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up." | ||
| if(BB) | ||
| BB.icon_state = "foamdart_riot" | ||
| else | ||
| icon_state = "foamdart" |
There was a problem hiding this comment.
icon_state = initial(icon_state)
|
How about replacing the if, else if, and else block with this; It is smaller then the one that is currently on the server, slightly more future proof then that one as well and has no bugs, and uses all the proper sprites. |
|
If you implemented what I stated, it's completely future proof for other colored darts, as long as the icon state on the foam dart and casing are properly set on the subtype. |
|
Never mind, I found out how to edit the Pull. |
|
Are you...using the git text editor? |
|
I am using dream maker but I just found the Git editor, I did just test this code however and it does work. |
| if(riot) | ||
| desc = "Whose smart idea was it to use toys as crowd control? ... Although, this one doesn't look too safe." | ||
| else | ||
| desc = "Its nerf or nothing! ... Although, this one doesn't look too safe." |
There was a problem hiding this comment.
The above reallyyyy isn't necessary.
|
I agree, I was trying to keep in how the dart's description says it looks unsafe, but without it does cut down on any additional lines if someone wants to add more darts in, shall I just take it out? |
|
Yeah, I'd just...take it out to be honest--the major problem here are the icons messing up. |
|
Ok, I took out the changing description and just left what is needed for the icons. |
| @@ -306,19 +306,18 @@ | |||
| icon = 'icons/obj/guns/toy.dmi' | |||
| icon_state = "foamdart" | |||
| var/modified = 0 | |||
| var/riot = 0 | |||
|
How about making it something along the lines of "This foam dart doesn't look too safe" so its more generic. The reason for a slightly more generic description is to help reduce the odds of a riot/new dart being confused for a normal foam force but still lets people know that is doesn't have the safety cap on. Also I took out the val/riot since it is no longer needed. |
|
Well I think its just about as future proof as it can get right now, although I doubt its perfect, any more thoughts? I have also tested it, all the icons are now displayed correctly. |
changes how the stechin updates it's magazine so the single shot magazine doesn't go invisable.
|
Fee, fi, foo, fur, |
This reverts commit 1197499.
|
uhhh, that last bit for the stechin pistol isn't meant to be on this one, oops. |
|
yup, I wasn't sure how to update the pull via dream maker but it looks like I did by accident. |
|
I've said it once, but it looks like I'm going to to have to say it again. If you can't be bothered to set up git and make changes in DM, directly, then don't bother submitting a PR at all. Github editor submitted PRs will be denied. |
|
@Fox-McCloud and, how does that matter in any way? Code is code. |
|
Because it means they didn't bother compiling or testing it. |
|
I did compile it and test it, I even said I wasn't sure how to update if from dream maker until I did it by accident. In addition to the multiple times I said I have tested it along the way, if you would like I could republish it from dream maker, but it would be the same exact tested code. |
| icon_state = "foamdart_empty" | ||
| desc = "Its nerf or nothing! ... Although, this one doesn't look too safe." |
There was a problem hiding this comment.
Don't change the description or order unless there's an explicit reason to. In this case, there isn't.
changes the discription and moves it one line down.
|
I still think that a the description "Its nerf or nothing! ... Although, this one doesn't look too safe." doesn't fit too well on modified riot darts and the slightly more generic "This foam dart doesn't look too safe" works well for both uncapped foam force, riot darts, and any future darts, but here is it is with the former description. |
Adds the variable riot to both normal foam darts and adds two else if statements and modifies one if statement to give both darts and both modified darts the correct icon.