cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

WT Rework and Nerf (#20536)

Browse Source 
* Reworks and nerfs WTs

* Removes some duplicate comments

* Makes WT ammo box's normal sized items because I forgot to at first

* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once

* Sanity checks work properly now

* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt

* Update code/__HELPERS/mob_helpers.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/__HELPERS/mob_helpers.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Magazines fit in security webbings

* I forgot a comma

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Applying various reviewer suggestions

* Applies various suggestions

* removes moving_do_after now that its a param

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* solves the merge conflict hopefully

* step one of trying to fix conflict again

* step two hopefully fixes conflict

* Delete ammo.dmi

* Merge branch 'master' into wt-rework

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Applying various reviewer suggestions

* Revert "Applying various reviewer suggestions"

This reverts commit 7081e9aa2b.

* Revert "Apply suggestions from code review"

This reverts commit 96dab4f8b8.

* Revert "Merge branch 'master' into wt-rework"

This reverts commit 6906a67654.

* Merge branch 'master' into wt-rework

* please god work

* Update code/modules/projectiles/ammunition.dm

* Update code/modules/projectiles/ammunition/magazines.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Samman166
2023-05-25 14:11:56 -02:30
committed by GitHub
parent 8b7f4c8b69
commit 49b26c4eba
8 changed files with 150 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
code/modules/research/designs/weapon_designs.dm
View File

@@ -146,37 +146,59 @@
category = list("Weapons")
//WT550 Mags
/datum/design/mag_oldsmg
name = "WT-550 Auto Gun Magazine (4.6x30mm)"
desc = "A 20 round magazine for the out of date security WT-550 Auto Rifle"
id = "mag_oldsmg"
req_tech = list("combat" = 1, "materials" = 1)
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000)
build_path = /obj/item/ammo_box/magazine/wt550m9
materials = list(MAT_METAL = 10000)
build_path = /obj/item/ammo_box/magazine/wt550m9/empty
category = list("Weapons")
/datum/design/mag_oldsmg/ap_mag
name = "WT-550 Auto Gun Armour Piercing Magazine (4.6x30mm AP)"
desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle"
id = "mag_oldsmg_ap"
/datum/design/box_oldsmg
name = "WT-550 Auto Gun Ammo Box (4.6x30mm)"
desc = "A box of 20 rounds for the out of date security WT-550 Auto Rifle"
id = "box_oldsmg"
req_tech = list("combat" = 1, "materials" = 1)
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000)
build_path = /obj/item/ammo_box/wt550
category = list("Weapons")
/datum/design/box_oldsmg/ap_box
name = "WT-550 Auto Gun Armour Piercing Ammo Box (4.6x30mm AP)"
desc = "A box of 20 armour piercing rounds for the out of date security WT-550 Auto Rifle"
id = "box_oldsmg_ap"
materials = list(MAT_METAL = 6000, MAT_SILVER = 600)
build_path = /obj/item/ammo_box/magazine/wt550m9/wtap
build_path = /obj/item/ammo_box/wt550/wtap
category = list("Weapons")
/datum/design/mag_oldsmg/ic_mag
name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)"
desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle"
id = "mag_oldsmg_ic"
/datum/design/box_oldsmg/ic_box
name = "WT-550 Auto Gun Incendiary Ammo Box (4.6x30mm IC)"
desc = "A box of 20 armour piercing rounds for the out of date security WT-550 Auto Rifle"
id = "box_oldsmg_ic"
materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000)
build_path = /obj/item/ammo_box/magazine/wt550m9/wtic
build_path = /obj/item/ammo_box/wt550/wtic
category = list("Weapons")
/datum/design/mag_oldsmg/tx_mag
name = "WT-550 Auto Gun Uranium Magazine (4.6x30mm TX)"
desc = "A 20 round uranium tipped magazine for the out of date security WT-550 Auto Rifle"
id = "mag_oldsmg_tx"
/datum/design/box_oldsmg/tx_box
name = "WT-550 Auto Gun Uranium Ammo Box (4.6x30mm TX)"
desc = "A box of 20 uranium tipped rounds for the out of date security WT-550 Auto Rifle"
id = "box_oldsmg_tx"
materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000)
build_path = /obj/item/ammo_box/magazine/wt550m9/wttx
build_path = /obj/item/ammo_box/wt550/wttx
category = list("Weapons")
/datum/design/mag_laser
name = "Laser Rifle Projector Magazine"
desc = "A 20 round encased projector magazine for the IK Laser Rifle series"
id = "mag_laser"
build_type = PROTOLATHE
req_tech = list("combat" = 4, "powerstorage" = 4)
materials = list(MAT_METAL = 4000, MAT_PLASMA = 600)
build_path = /obj/item/ammo_box/magazine/laser
category = list("Weapons")
/datum/design/mag_laser
name = "Laser Rifle Projector Ammunition"