-
Notifications
You must be signed in to change notification settings - Fork 345
3D printed guns. #4814
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
Merged
Merged
3D printed guns. #4814
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
a89d628
GUNS
Uristthedorf b57fe68
Update fss.dm
Uristthedorf c3d6e5e
Update fss.dm
Uristthedorf efb68e1
Sprite and bulky
Uristthedorf 884e44b
Disk and black market
Uristthedorf ba013c7
uplink
Uristthedorf ff1973f
Making an FSS doesnt give you a mag
Uristthedorf 924d153
Nerfs and price reduction
Uristthedorf 7f2adbe
Can buy disk from emagged cargo
Uristthedorf 089bfae
Update maintenance_loot.dm
Uristthedorf 2888e05
Loading now takes time.
Uristthedorf b083d5c
Update fss.dm
Uristthedorf 05baddf
Buffs damage
Uristthedorf 9229f9e
Update fss.dm
Uristthedorf e47b652
Moves fss.dm file
Uristthedorf 9405ba5
Adds to BB gear
Uristthedorf acd79c4
Merge branch 'master' into FGC
Uristthedorf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
127 changes: 127 additions & 0 deletions
127
monkestation/code/modules/projectiles/guns/ballistic/fss.dm
This file contains hidden or 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 |
---|---|---|
@@ -0,0 +1,127 @@ | ||
/obj/item/gun/ballistic/automatic/wt550/fss //Slightly worse printable WT-550 | ||
name = "\improper FSS-550" | ||
desc = "A modified printable version of the WT-550 autorifle, in order to be printed by an autolathe, some sacrifices had to be made. Not only does this gun have less stopping power, the magazine doesn't entirely fit, and it takes a bit of force to jam it in or rip it out. Used by Syndicate agents and rebels in more than 50 systems." | ||
icon = 'monkestation/icons/obj/guns/guns.dmi' | ||
lefthand_file = 'monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi' | ||
righthand_file = 'monkestation/icons/mob/inhands/weapons/guns_righthand.dmi' | ||
icon_state = "fss550" | ||
inhand_icon_state = "fss" | ||
spread = 2 | ||
projectile_damage_multiplier = 0.9 | ||
///How long does it take to add or remove a magazine from this gun. | ||
var/magazine_time = 4 SECONDS | ||
|
||
///Modify proc so it takes time to add or remove the magazine. | ||
/obj/item/gun/ballistic/automatic/wt550/fss/insert_magazine(mob/user, obj/item/ammo_box/magazine/AM, display_message = TRUE) | ||
if(!istype(AM, accepted_magazine_type)) | ||
balloon_alert(user, "[AM.name] doesn't fit!") | ||
return FALSE | ||
if(!do_after(user, magazine_time, target = src)) | ||
balloon_alert(user, "interrupted!") | ||
return FALSE | ||
if(user.transferItemToLoc(AM, src)) | ||
magazine = AM | ||
if (display_message) | ||
balloon_alert(user, "[magazine_wording] loaded") | ||
playsound(src, load_empty_sound, load_sound_volume, load_sound_vary) | ||
if (bolt_type == BOLT_TYPE_OPEN && !bolt_locked) | ||
chamber_round(TRUE) | ||
update_appearance() | ||
return TRUE | ||
else | ||
to_chat(user, span_warning("You cannot seem to get [src] out of your hands!")) | ||
return FALSE | ||
|
||
///Modify proc so it takes time to add or remove the magazine. | ||
/obj/item/gun/ballistic/automatic/wt550/fss/eject_magazine(mob/user, display_message = TRUE, obj/item/ammo_box/magazine/tac_load = null) | ||
if(!do_after(user, magazine_time, target = src)) | ||
balloon_alert(user, "interrupted!") | ||
return FALSE | ||
if(bolt_type == BOLT_TYPE_OPEN) | ||
chambered = null | ||
if (magazine.ammo_count()) | ||
playsound(src, load_sound, load_sound_volume, load_sound_vary) | ||
else | ||
playsound(src, load_empty_sound, load_sound_volume, load_sound_vary) | ||
magazine.forceMove(drop_location()) | ||
var/obj/item/ammo_box/magazine/old_mag = magazine | ||
if (tac_load) | ||
if (insert_magazine(user, tac_load, FALSE)) | ||
balloon_alert(user, "[magazine_wording] swapped") | ||
else | ||
to_chat(user, span_warning("You dropped the old [magazine_wording], but the new one doesn't fit. How embarassing.")) | ||
magazine = null | ||
else | ||
magazine = null | ||
user.put_in_hands(old_mag) | ||
old_mag.update_appearance() | ||
if (display_message) | ||
balloon_alert(user, "[magazine_wording] unloaded") | ||
update_appearance() | ||
|
||
/obj/item/gun/ballistic/automatic/wt550/fss/no_mag | ||
spawnwithmagazine = FALSE | ||
|
||
/obj/item/disk/design_disk/fss | ||
name = "FSS-550 Design Disk" | ||
desc = "A disk that allows an autolathe to print the FSS-550 and associated ammo." | ||
icon_state = "datadisk1" | ||
|
||
/obj/item/disk/design_disk/fss/Initialize(mapload) | ||
. = ..() | ||
blueprints += new /datum/design/fss | ||
blueprints += new /datum/design/mag_autorifle_fss | ||
blueprints += new /datum/design/mag_autorifle_fss/ap_mag | ||
blueprints += new /datum/design/mag_autorifle_fss/ic_mag | ||
blueprints += new /datum/design/mag_autorifle_fss/rub_mag | ||
blueprints += new /datum/design/mag_autorifle_fss/salt_mag | ||
|
||
/datum/design/fss | ||
name = "FSS-550" | ||
desc = "FSS-550 autorifle." | ||
id = "fss" | ||
build_type = AUTOLATHE | ||
materials = list(/datum/material/iron = 20000, /datum/material/glass = 1000) | ||
build_path = /obj/item/gun/ballistic/automatic/wt550/fss/no_mag | ||
category = list(RND_CATEGORY_IMPORTED) | ||
|
||
/datum/design/mag_autorifle_fss //WT-550 ammo but printable in autolathe and you get it from a design disk. | ||
name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)" | ||
desc = "A 20 round magazine for the out of date WT-550 Autorifle." | ||
id = "mag_autorifle_fss" | ||
build_type = AUTOLATHE | ||
materials = list(/datum/material/iron = 12000) | ||
build_path = /obj/item/ammo_box/magazine/wt550m9 | ||
category = list(RND_CATEGORY_IMPORTED) | ||
|
||
/datum/design/mag_autorifle_fss/ap_mag | ||
name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP) (Lethal)" | ||
desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." | ||
id = "mag_autorifle_ap_fss" | ||
materials = list(/datum/material/iron = 15000, /datum/material/silver = 600) | ||
build_path = /obj/item/ammo_box/magazine/wt550m9/wtap | ||
category = list(RND_CATEGORY_IMPORTED) | ||
|
||
/datum/design/mag_autorifle_fss/ic_mag | ||
name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC) (Lethal/Highly Destructive)" | ||
desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." | ||
id = "mag_autorifle_ic_fss" | ||
materials = list(/datum/material/iron = 15000, /datum/material/silver = 600, /datum/material/glass = 1000) | ||
build_path = /obj/item/ammo_box/magazine/wt550m9/wtic | ||
category = list(RND_CATEGORY_IMPORTED) | ||
|
||
/datum/design/mag_autorifle_fss/rub_mag | ||
name = "WT-550 Autorifle Rubber Magazine (4.6x30mm R) (Lethal)" | ||
desc = "A 20 round rubber magazine for the out of date WT-550 Autorifle." | ||
id = "mag_autorifle_rub_fss" | ||
materials = list(/datum/material/iron = 6000) | ||
build_path = /obj/item/ammo_box/magazine/wt550m9/wtrub | ||
category = list(RND_CATEGORY_IMPORTED) | ||
|
||
/datum/design/mag_autorifle_fss/salt_mag | ||
name = "WT-550 Autorifle Saltshot Magazine (4.6x30mm SALT) (Non-Lethal)" | ||
desc = "A 20 round saltshot magazine for the out of date WT-550 Autorifle." | ||
id = "mag_autorifle_salt_fss" | ||
materials = list(/datum/material/iron = 6000, /datum/material/plasma = 600) | ||
build_path = /obj/item/ammo_box/magazine/wt550m9/wtsalt | ||
category = list(RND_CATEGORY_IMPORTED) |
This file contains hidden or 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
Binary file not shown.
Binary file modified
BIN
+489 Bytes
(120%)
monkestation/icons/mob/inhands/weapons/guns_righthand.dmi
Binary file not shown.
Binary file not shown.
This file contains hidden or 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.
might be able to take this down to 4, we will see
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.
Should I reduce the price?