Shazbot's Armory [WIP] #7540
Shazbot's Armory [WIP] #7540
Conversation
| @@ -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 auto rifle" | |||
| desc = "An outdated personal defense weapon utilized by law enforcement. The WT-550 Automatic Rifle fires 4.6x30mm rounds." | |||
| name = "security Assault Pistol" | |||
There was a problem hiding this comment.
non-standardized capitalization
There was a problem hiding this comment.
Thanks, I will change that to be consistent.
|
|
||
| /obj/item/weapon/gun/projectile/automatic/m4 | ||
| name = "tran sol combat rifle" | ||
| desc = "An anchient yet robust assault rile used by Tran-Solar Federation's ground fighting forces." |
There was a problem hiding this comment.
that was just a my bad, fixing right away.
fixes some naming and desc problems
| name = "tranquilizer darts" | ||
| desc = "A tranquilizer round used to subdue individuals utilizing stimulants." | ||
| name = "anti-stimulant darts" | ||
| desc = "A anti-stimulant round used to subdue individuals utilizing stimulants." |
| icon_state = "nshell" | ||
| projectile_type = /obj/item/projectile/bullet/dart/syringe/tranquilizer | ||
| materials = list(MAT_METAL=250) | ||
|
|
||
| /obj/item/ammo_casing/shotgun/dart/speacial |
| icon_state = "emptiedart" | ||
| projectile_type = /obj/item/projectile/bullet/dart/g20 | ||
|
|
||
| /obj/item/ammo_casing/shotgun/dart/speacial/tranquilizer |
| /obj/item/ammo_casing/shotgun/dart/speacial/tranquilizer | ||
| icon_state = "tranqdart" | ||
|
|
||
| /obj/item/ammo_casing/shotgun/dart/speacial/tranquilizer/New() |
| name = "ammo box (20G tranquilizer darts)" | ||
| icon_state = "tranqbox" | ||
| origin_tech = "combat=2" | ||
| ammo_type = /obj/item/ammo_casing/shotgun/dart/speacial/tranquilizer |
| @@ -119,6 +119,17 @@ | |||
| ammo_type = /obj/item/ammo_casing/shotgun/rubbershot | |||
| max_ammo = 6 | |||
|
|
|||
| /obj/item/ammo_box/magazine/internal/dart | |||
| name = "single shot dart gun internal magazine" | |||
| ammo_type = /obj/item/ammo_casing/shotgun/dart/speacial/tranquilizer | |||
fixes special
|
Needs a CL, at least |
|
Slowly adding in the description, and its a WIP. |
|
|
||
|
|
||
| /obj/item/weapon/gun/projectile/revolver/tranqpistol | ||
| name = "Tranqualiser Pistol" |
There was a problem hiding this comment.
Tranqualiser -> Tranquilizer
|
|
||
| /obj/item/weapon/gun/projectile/revolver/tranqpistol | ||
| name = "Tranqualiser Pistol" | ||
| desc = "A new tranqualiser pistol meant to help subdue wild prisoners.." |
There was a problem hiding this comment.
Tranqualiser -> Tranquilizer
Also finish with 3 or 4 full stops, never 2.
| CB.update_icon() | ||
| num_unloaded++ | ||
| if(num_unloaded) | ||
| to_chat(user, "<span class = 'notice'>You open \the [src] and unload the shell.</span>") |
There was a problem hiding this comment.
afaik the \the isn't needed.
|
|
||
| /obj/item/weapon/gun/projectile/automatic/sniper_rifle/dragon | ||
| name = "dragon" | ||
| desc = "cheap and effective, what more could you want from a DMR" |
There was a problem hiding this comment.
Capitalise the start of the sentence and full stop the end, like the other descriptions
|
@shazbot194 If it's a WIP, you can append [WIP] to your title so that maintainers know not to merge / close it. |
|
@Citinited Thanks, sorry, this is my first WIP and I am trying to keep up with the mistakes I made and trying to fix them. |
| name = "Tranquilizer rounds" | ||
| icon_state = "oldrifle" | ||
| origin_tech = "combat=6" | ||
| ammo_type = /obj/item/ammo_casing/shotgun/dart/speacial/tranquilizer |
|
@shazbot194 You don't need to apologise, I was just letting you know you can do it. 😄 |
even more text fixes
| name = "security auto rifle" | ||
| desc = "An outdated personal defense weapon utilized by law enforcement. The WT-550 Automatic Rifle fires 4.6x30mm rounds." | ||
| 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.
WT-550 Automatic Rifle should be changed to assault pistol.
| icon_state = "wt550" | ||
| item_state = "arg" | ||
| mag_type = /obj/item/ammo_box/magazine/wt550m9 | ||
| fire_delay = 2 | ||
| can_suppress = 0 | ||
| 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 TRUE / FALSE (I'm led to believe it's standard practice to? @tigercat2000 ). 1 / 0 does work though
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.
| @@ -462,6 +462,6 @@ | |||
| CB.update_icon() | |||
| num_unloaded++ | |||
| if(num_unloaded) | |||
| to_chat(user, "<span class = 'notice'>You open \the [src] and unload the shell.</span>") | |||
| to_chat(user, "<span class = 'notice'>You open the [src] and unload the shell.</span>") | |||
There was a problem hiding this comment.
Nah, as in having [src] it should automatically add the the, but try it.
| @@ -150,7 +150,7 @@ | |||
|
|
|||
| /obj/item/weapon/gun/projectile/automatic/sniper_rifle/dragon | |||
| name = "dragon" | |||
| desc = "cheap and effective, what more could you want from a DMR" | |||
| desc = "Cheap and effective, what more could you want from a DMR" | |||
There was a problem hiding this comment.
still needs the full stop at the end.
Adds a full auto upgrade for the sporting rifle to the protolathe
| origin_tech = "combat=6;engineering=4" | ||
| mag_type = /obj/item/ammo_box/magazine/stan | ||
| fire_sound = 'sound/weapons/Gunshot_smg.ogg' | ||
| can_suppress = 1 |
|
|
||
| /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.
| /obj/item/device/fullautoupgrade | ||
| name = "Full Auto Sporting Rifle Upgrade" | ||
| icon_state = "auto-upgrade" | ||
| desc = "An upgrade unit that can be installed on a sporting rifles to make them fully automatic." |
There was a problem hiding this comment.
installed on a sporting rifles -> installed on sporting rifles
| unique_rename = 0 | ||
| unique_reskin = 0 | ||
| can_unsuppress = 0 | ||
| suppressed = 1 |
see above
| mag_type = /obj/item/ammo_box/magazine/internal/shot/dominator | ||
| unique_rename = 0 | ||
| unique_reskin = 0 | ||
| can_unsuppress = 0 |
|
|
||
| /obj/item/weapon/gun/projectile/revolver/tranqpistol | ||
| name = "tranquilizer pistol" | ||
| desc = "A new tranquilizer pistol meant to help subdue wild prisoners.." |
|
|
||
| /datum/design/fullauto_upgrade | ||
| name = "Full Auto Sporting Rifle Upgrade" | ||
| desc = "A lower body reciver for an sporting rifle to make it fully automatic." |
There was a problem hiding this comment.
reciver -> receiver
an -> a
REVOLVERS
|
Spell check spell check spell check |
|
Sorry, its really late here and I probably should be sleeping rather then making new code. |
tigercat2000
added
Feature
| @@ -110,6 +110,13 @@ | |||
| ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer | |||
| materials = list(MAT_METAL=1750) | |||
|
|
|||
| /obj/item/ammo_box/tranqdarts | |||
There was a problem hiding this comment.
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.
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.
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.
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.
Ok, I have changed them to 9x39mm rifle rounds and updated all the icons and names to match.
|
Love the triangulizer pistol / rifle. Might run a jurrasic park event if those get added. |
Adds in the A-95 carbine
the file didn't save when I made the commit, so here it is now.
Now they can be ordered from cargo
| containername = "Stimpson short magazine crate" | ||
|
|
||
| /datum/supply_packs/security/stanmagpistol | ||
| name = "Stimpson Standart Magazine Crate" |
| contains = list(/obj/item/ammo_box/magazine/pistolm9mm, | ||
| /obj/item/ammo_box/magazine/pistolm9mm) | ||
| cost = 25 | ||
| containername = "Stimpson standart magazine crate" |
There was a problem hiding this comment.
I need to stop writing code when I'm tired
|
I'm code retarded and I just want to make sure. |
|
It is an offshoot of the shotgun darts, so whatever can block the shotgun darts will also block these. |
|
I thought we didn't need more guns? |
|
Why would you think that? We could always use more guns, expecialy ones that aren't identical in function to the ones we already have. |
|
Hey Guys, so it has come to this, a temperary close on this pull. Its not that I don't think this pull in of itself is bad, but I want to resubmit it in the proper way so I can possibly have multiple pulls going as well as fixing some problems I just cannot fix at this momemt, so this will be back shortly. |
This is a work in progress, and sorry about messing up the title, it is fixed now.
If you wish to talk about how some of these would fit into space law, I made a post here.
So this pull is adding in a bunch of firearms and changing and improving the code of other firearms. It is currently a work in progress although I want to open this for both critique and criticism. One goal is to add is to also add more civilian guns to the cargo manifest as a cheaper alternative to combat shotguns and so anyone who is capable of getting a gun license won't need to get a (para)military style firearm.
I am still adding in more sprites, so some of the back-wearing sprites are not in yet and some item sprites are subject to change.
For starters, lets review what will be changed:
The Enforcer:
Fixes sprite problem and will later be added into the cargo manifest for officers.
Cargo Cost:
3 Pistols: 45
3 rubber magazines: 30
3 lethal magazines: 40
WT-550
Made it into an assault pistol and also lets it accept suppressors. No other changes.
Pump action shotgun
Meant to be a cheap alternitive to arm up the crew during nuke ops or as a way to arm new barkeeps.
Cargo Cost:
3 shotguns: 30
Foam Force SMG
Now with a red colored tip and loaded with riot darts.
Cargo Cost:
1 gun and two magazines: 25
Now for what is being added.
Tranquilizer guns
These guns shoot special 9x39mm rifle rounds that contain a heavy sedative meant to subdue problem prisoners. It comes in a single-shot pistol and a multi-shot rifle. These will be available to order from cargo and one pistol and some ammo will possibly be provided to the armory. Blank shells will be available at hacked autolathes and can be filled with any chemicals you have, up to 30u.
Cargo Cost:
1 Rifle: 80
2 Magazines: 40
2 ammo boxes: 30
3 pistols: 20
unloaded ammo box to be added to autolathe
Sporting rifle and combat rifle
Very old rifles that are still in use by the Tran-Sol. ground forces. These rifles are top of the line in all but looks, after all, they have over 500 years of development. The sporting rifle is a single shot version of the combat rifle with a single stack short magazine. The sporting rifle will be available as part of the civilian gun program and the combat rifle as part of admin spawned events featuring Sol Gov. These also will accept suppressors.
Update: The sporting rifle now can be upgraded with a full auto receiver from the protolathe, but due to concerns over a full assault rifle being made available, it is place in a lockerbox.
Cargo Cost:
2 rifles: 80
2 short magazines: 25
2 long magazines: 100
Ammo boxes to be added to autolathe
The Dominator
A suppressed quad-barreled shotgun. Meant to be an alternitive gun for those who have a lot of teli-crystals and want something quiet with a lot of punch. I am thinking of changing the sprite, but until I either make a better one or someone gives me one, it will stick with this for testing.
10mm automatic pistols
A development of the Stechkin to try and make it more of a military pistol. These feature include a larger frame, a 18 round magazines and a three round burst. It was devolved after an internal investigation relieving that assault teams use concealable pistols rather then full sized military pistols. These would be given to nuke ops instead of Stechkins and would not be available to normal traitors or would be at a steep price.
Stimpson pistol
A smaller version of the Stechkin made to shoot 9mm. The company that makes Stechkin was having problems selling the Stechkin on the civilian market due to the very close association the pistol has with covert operations, so they changed several features namely the barrel, slide, and caliber to try and make it disassociated from its bigger brother. It also uses double stack magazines giving it way more ammo then you might think in such a small package. However, due to this, Nanotrasen replaced and magazines that ships with the gun with to a very limited 6 shot magazine, however unaltered 15 round magazines and ever massive 30 round magazines will be made available, for a price. They also kept their threaded barrels and so can accept suppressors.
Cargo Cost:
2 Pistols: 25
5 short 6 round magazines: 20
2 standard 15 round magazines: 25
1 long 30 round magazine: 30
The Dragon
An old DRM now made available to syndicate assault teams. While not quite as powerful as the .50 caliber sniper rifle nor having specialty ammo, it makes up by being easier to handle, holding more ammo, and still being deadly. It also accepts syndicate suppressors for an added surprise. The final cost will be about 3/4 to 4/5 the cost of the Sniper Rifle with ammo being about the same.
A-95 Carbine
A remake of an old police carbine, the A-95 was made with riot suppression in mind. Loading subsonic 9x39mm rubber bullets and 25mm caseless flashbang or 25mm tear gas grenades, it is one of the best riot guns available to security forces. However, should the need arise, it can load lethal 9x39mm ammo and explosive grenades.
Cargo Cost:
1 rifle: 150
2 rubber magazines: 80
2 lethal magazines: 100
Flashbang box: 80
Laser rifles
I think I will leave these out of this pull as it is already very expansive and doesn't need a whole new feature to complicate this and further reduce the chance this has of being added to the server.