-
Notifications
You must be signed in to change notification settings - Fork 95
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
Donger SG Sprites #221
Donger SG Sprites #221
Conversation
This reverts commit b1f8fc5.
For reference, these are the 'new' sprites that're being added:
|
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.
Left a few comments. I didn't look that indepth into it, so think of my comments as more of suggestions than hard requests. Close them as you go through them. I'm sure others may have some as well.
I like that you commented your code, always good to do that.
"icon_x" = 0, | ||
"icon_y" = 0)) | ||
|
||
var/list/holstered_guns = list() |
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.
Does this need to be a list? Is it possible to fit more than one gun into the holster? If it is, might be fine.
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.
I've tried to edit it but things seem to break for some reason.
if(!magazines) | ||
return | ||
if(magazines <= (storage_slots - length(holster_slots)) * 0.5) //Don't count slots reserved for guns, even if they're empty. | ||
overlays += "+[base_icon]_half" |
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.
Can be written as:
overlays += "+[base_icon]_[magazines <= (storage_slots - length(holster_slots)) * 0.5) ? "half" : "full"]"
sure that we don't have to do any extra calculations. | ||
*/ | ||
playsound(src, drawSound, 7, TRUE) | ||
var/image/gun_underlay = image(icon, current_gun.base_gun_icon) |
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 can probably use vis_contents here instead of using image. You essentially add the object itself as an underlay for the sprite and manipulate it accordingly.
Most of the code is ripped from the M4A3 pistol belt code, so that's where most of the comments come from. I've just been modifying the code to make it work with what I had in mind. For some reason, though, the onmob doesn't update when you put a pistol in the holster, when it should. |
Had the opportunity to test out the pull request on Blue.
Good work, overall! |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
desc = "holster" | ||
icon = 'icons/obj/items/storage.dmi' |
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.
needs cool desc
//Drake Vest | ||
/obj/item/clothing/accessory/flak | ||
name = "M70 flak vest" | ||
desc = "Venlar flak jacket worn by combat support personnel such as dropship crew, or occasionally by smartgunners. Despite the name it's actually better at stopping ballistics...." |
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.
misleading desc since it has no armor + too much periods!!!!!
/obj/item/ammo_magazine/pistol, | ||
) | ||
|
||
/obj/item/storage/large_holster/m56/post_skin_selection() |
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.
does it really need to redefine all these procs..??? am i missing something?
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Resprites the SG equipment to actually look good, as well as adds a version of the M70 flak vest that you can attach to your uniform just for the look, now available in the gear section of character creation for smartgunners.
Also adds sprites for a potential smartgunner pistol belt that would go on their back, as well as a new M56 harness that is with a 'movie accurate' palette with plans on implementation.