Shazbot's Armory [WIP] #7540
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -102,19 +102,19 @@ | |
| icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" | ||
|
|
||
| /obj/item/weapon/gun/projectile/automatic/wt550 | ||
| name = "security assault pistol" | ||
| desc = "An outdated personal defense weapon utilized by law enforcement reintroduced into service as an assault pistol. The WT-550 Automatic Rifle fires 4.6x30mm rounds." | ||
|
There was a problem hiding this comment.
|
||
| icon_state = "wt550" | ||
| item_state = "arg" | ||
| mag_type = /obj/item/ammo_box/magazine/wt550m9 | ||
| fire_delay = 2 | ||
| can_suppress = 1 | ||
|
There was a problem hiding this comment. I have tested this, it works with the 1, and I have yet to see any other gun use TRUE. There was a problem hiding this comment. If it's a boolean variable, you may as well use There was a problem hiding this comment. @shazbot194 if its a binary yes/no, we should be using TRUE/FALSE afaik in accordance with Paradise coding standards - but I could be entirely mistaken there. Pre-existing code isn't all up to standard. There was a problem hiding this comment. Ok, I will change it, it was just confusing to me as to why TRUE/FALSE isn't in use in other places. |
||
| burst_size = 1 | ||
| actions_types = list() | ||
|
|
||
| /obj/item/weapon/gun/projectile/automatic/wt550/update_icon() | ||
| ..() | ||
| icon_state = "wt550[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][suppressed ? "-s" : ""]" | ||
|
|
||
| /obj/item/weapon/gun/projectile/automatic/mini_uzi | ||
| name = "\improper 'Type U3' Uzi" | ||
|
|
@@ -265,3 +265,38 @@ | |
| /obj/item/weapon/gun/projectile/automatic/lasercarbine/update_icon() | ||
| ..() | ||
| icon_state = "lasercarbine[magazine ? "-[Ceiling(get_ammo(0)/5)*5]" : ""]" | ||
|
|
||
| /obj/item/weapon/gun/projectile/automatic/m4 | ||
| name = "tran sol combat rifle" | ||
| desc = "An ancient yet robust assault rile used by Tran-Solar Federation's ground fighting forces." | ||
| icon_state = "m-4" | ||
| item_state = "arg" | ||
| slot_flags = 0 | ||
| w_class = WEIGHT_CLASS_HUGE | ||
| origin_tech = "combat=6;engineering=4" | ||
| mag_type = /obj/item/ammo_box/magazine/stan | ||
| fire_sound = 'sound/weapons/Gunshot_smg.ogg' | ||
| can_suppress = 1 | ||
|
|
||
| burst_size = 3 | ||
| fire_delay = 1 | ||
|
|
||
| /obj/item/weapon/gun/projectile/automatic/m4/update_icon() | ||
| if(magazine) | ||
| if(magazine.max_ammo>29) | ||
| icon_state = "[initial(icon_state)]-l[suppressed ? "-su" : ""]" | ||
| else | ||
| icon_state = "[initial(icon_state)]-s[suppressed ? "-su" : ""]" | ||
| else | ||
| icon_state = "[initial(icon_state)]-e[suppressed ? "-su" : ""]" | ||
|
|
||
| /obj/item/weapon/gun/projectile/automatic/m4/sp1 | ||
| name = "sporting rifle" | ||
| desc = "A sporting version of the assault rile used by Tran-Solar Federation's ground fighting forces." | ||
|
There was a problem hiding this comment. How did I miss that one. |
||
| icon_state = "SP-1" | ||
| burst_size = 1 | ||
| actions_types = list() | ||
|
|
||
|
|
||
| /obj/item/weapon/gun/projectile/automatic/m4/sp1/New() | ||
| magazine = new /obj/item/ammo_box/magazine/stan/short(src) | ||
| ..() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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'm willing to bet this looks like a box, but behaves like a speedloader. This is inconsistent with the way things work currently on Paradise.
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.
Currently, all ammo boxes except shotgun shells, .38, .357, 7.62 stripper clip, and capslook like boxed and act like speed loaders. This would include 10mm, 9mm, .45 caliber, .45 caliber rubber, 40mm, 7.62mm boxes, foam force darts, and riot foam darts.
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'm ok with loose pistol/rifle rounds in boxes acting like speedloaders -> mags. Only shotgun shells and bigger should need to be loaded in manually due to their size and encumbrance.
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 it would help, since these aren't shotgun shells but rather their own thing, I can change them from being a 20g style shell and make them into a normal copper shell casing.
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.
Ok, I have changed them to 9x39mm rifle rounds and updated all the icons and names to match.