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

loadout update, armour tweaks

Browse Source
This commit is contained in:
S34NW
2021-06-13 16:56:57 +01:00
parent 9c8f566966
commit ba45742fe9
9 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/jobs.dm
+4 -2
View File
@@ -206,11 +206,13 @@
icon_state = "solgovcberet"
item_color = "solgovc"
dog_fashion = null
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
strip_delay = 80
/obj/item/clothing/head/beret/solgov/command/elite
name = "\improper Trans-Solar Federation Specops Lieutenant's beret"
desc = "A beret worn by marines of the Trans-Solar Federation Psiops division. The insignia signifies the wearer bears the rank of a Lieutenant."
desc = "A beret worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant."
armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 50, "fire" = 80, "acid" = 80)
icon_state = "solgovceliteberet"
item_color = "solgovcelite"
resistance_flags = FIRE_PROOF
code/modules/clothing/head/soft_caps.dm
+9 -5
View File
@@ -125,28 +125,32 @@
dog_fashion = null
/obj/item/clothing/head/soft/solgov/marines
armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
strip_delay = 60
armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
icon_state = "solgovsoft_flipped"
strip_delay = 60
flipped = TRUE
/obj/item/clothing/head/soft/solgov/marines/elite
name = "\improper Trans-Solar Federation Specops marine cap"
desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division."
desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is!"
armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 50, "fire" = 80, "acid" = 80)
icon_state = "solgovelitesoft_flipped"
item_color = "solgovelite"
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/soft/solgov/marines/command
name = "\improper Trans-Solar Federation lieutenant's cap"
desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
icon_state = "solgovcsoft_flipped"
item_color = "solgovc"
dog_fashion = null
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
strip_delay = 80
/obj/item/clothing/head/soft/solgov/marines/command/elite
name = "\improper Trans-Solar Federation Specops Lieutenant's cap"
desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant."
desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant."
armor= list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 50, "fire" = 80, "acid" = 80)
icon_state = "solgovcelitesoft"
item_color = "solgovcelite"
resistance_flags = FIRE_PROOF
code/modules/clothing/suits/armor.dm
+19
View File
@@ -232,6 +232,25 @@
strip_delay = 70
put_on_delay = 50
/obj/item/clothing/suit/armor/bulletproof/full
name = "\improper Trans-Solar Federation marine armor"
icon_state = "bulletproof_full"
item_state = "bulletproof_full"
armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 50, "rad" = 50, "fire" = 80, "acid" = 80)
desc = "A bulletproof suit used by elite TSF marines. It excels in protecting the wearer against traditional projectile weaponry. Oorah!"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
resistance_flags = FIRE_PROOF
strip_delay = 80
put_on_delay = 80
/obj/item/clothing/suit/armor/bulletproof/full/officer
name = "\improper Trans-Solar Federation officer coat"
icon_state = "lt_jacket"
item_state = "lt_jacket"
desc = "A bulletproof overcoat used by TSF officers. Quite how this reduces the effect of impacting bullets is a mystery to you."
/obj/item/clothing/suit/armor/laserproof
name = "ablative armor vest"
desc = "A vest that excels in protecting the wearer against energy projectiles. Projects an energy field around the user, allowing a chance of energy projectile deflection no matter where on the user it would hit."