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

Merge pull request #15652 from E-MonaRhg/gamma_armory_buff_v2

Browse Source 
Buffs to gamma armory v2
This commit is contained in:
variableundefined
2021-08-14 11:30:15 -04:00
committed by GitHub
parent 40141c020a 05a90463b3
commit c6c84c478d
8 changed files with 103 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/hardsuit.dm
+21
View File
@@ -711,3 +711,24 @@
item_state = "syndie_helm"
item_color = "syndi"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 15, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
//////Security Version (Gamma armory only)
/obj/item/clothing/suit/space/hardsuit/shielded/gamma
name = "shielded security hardsuit"
desc = "A more advanced version of the normal security hardsuit. Comes with built in energy shielding."
icon_state = "hardsuit-sec"
item_state = "sec-hardsuit"
armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/baton,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/restraints/handcuffs)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/gamma
/obj/item/clothing/head/helmet/space/hardsuit/shielded/gamma
name = "shielded security hardsuit helmet"
desc = "A more advanced version of the normal security hardsuit helmet. Comes with built in energy shielding."
icon_state = "hardsuit0-sec"
item_state = "sec_helm"
item_color = "sec"
armor = list("melee" = 35, "bullet" = 15, "laser" = 30,"energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
code/modules/projectiles/guns/projectile/automatic.dm
+1 -1
View File
@@ -79,7 +79,7 @@
//Saber SMG//
/obj/item/gun/projectile/automatic/proto
name = "\improper Nanotrasen Saber SMG"
desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
desc = "A rejected prototype three-round burst 9mm submachine gun, designated 'SABR'. Surplus of this model are bouncing around armories of Nanotrasen Space Stations. Has a threaded barrel for suppressors."
icon_state = "saber"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
origin_tech = "combat=4;materials=2"