cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Paradise's soul removal part 2.5: rest of security (#19522)

Browse Source 
* Security suit resprite

* Map in security variants of riot and bulletproof armors

* Security hats resprite

* Security belt and webbing resprite

* Blue warden by default because why not

* Very tiny (literally one pixel) tweak to the HoS trenchcoat

* Security riot suit in the name

* Small armor with badge oopsie

* Vox suit and hat variants

* Species variants of new security suits and helmets

* Deconflicted

* Deconflicted again

* Forgot about the warden's beret existance

* Deconflicted suits part two

* Blueshield armor too because it would look out of place otherwise

* Deconflicted belts

* Accidental duplicate I'll fix here
This commit is contained in:
ElorgRHG
2022-11-22 16:51:26 -05:00
committed by GitHub
parent ed3c63df8e
commit 08a9b19d19
24 changed files with 90 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/collectable.dm
+2 -2
View File
@@ -56,7 +56,7 @@
/obj/item/clothing/head/collectable/police
name = "collectable police officer's hat"
desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW."
icon_state = "policehelm"
icon_state = "policehat"
dog_fashion = /datum/dog_fashion/head/warden
/obj/item/clothing/head/collectable/beret
@@ -128,7 +128,7 @@
/obj/item/clothing/head/collectable/HoS
name = "collectable HoS hat"
desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!"
icon_state = "hoscap"
icon_state = "hos_cap"
/obj/item/clothing/head/collectable/HoP
name = "collectable HoP hat"
code/modules/clothing/head/jobs.dm
+14 -5
View File
@@ -129,7 +129,7 @@
/obj/item/clothing/head/HoS
name = "head of security's cap"
desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge."
icon_state = "hoscap"
icon_state = "hos_cap"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, BIO = 5, RAD = 0, FIRE = 50, ACID = 75)
strip_delay = 80
dog_fashion = /datum/dog_fashion/head/HoS
@@ -147,18 +147,25 @@
/obj/item/clothing/head/warden
name = "warden's police hat"
desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
icon_state = "policehelm"
icon_state = "policehat"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, BIO = 0, RAD = 0, FIRE = 20, ACID = 75)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/warden
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/officer
name = "officer's cap"
desc = "A red cap with an old-fashioned badge on the front for establishing that you are, in fact, the law."
icon_state = "customshelm"
item_state = "customshelm"
icon_state = "sechat"
item_state = "sechat"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, BIO = 0, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 60
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/drillsgt
name = "security campaign hat"
@@ -167,7 +174,9 @@
item_state = "drillsgthat"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, BIO = 0, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 60
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/beret/sec
name = "security beret"
desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
code/modules/clothing/suits/armor.dm
+40 -3
View File
@@ -106,6 +106,12 @@
suit_adjusted = 1
actions_types = list(/datum/action/item_action/openclose)
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/suit/armor/hos
name = "armored coat"
@@ -118,6 +124,11 @@
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
strip_delay = 80
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/suit/armor/hos/alt
name = "armored trenchcoat"
@@ -149,6 +160,11 @@
strip_delay = 70
resistance_flags = FLAMMABLE
dog_fashion = null
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/suit/armor/vest/warden/alt
name = "warden's jacket"
@@ -217,7 +233,17 @@
flags_inv = HIDEJUMPSUIT
strip_delay = 80
put_on_delay = 60
hide_tail_by_species = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/suit/armor/riot/sec
name = "security riot suit"
desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement. This one has security markings on it."
icon_state = "riot-sec"
item_state = "swat_suit"
/obj/item/clothing/suit/armor/riot/knight
name = "plate armour"
@@ -225,6 +251,7 @@
icon_state = "knight_green"
item_state = "knight_green"
slowdown = 1
sprite_sheets = list()
/obj/item/clothing/suit/armor/riot/knight/yellow
icon_state = "knight_yellow"
@@ -268,8 +295,18 @@
armor = list(MELEE = 10, BULLET = 50, LASER = 5, ENERGY = 5, BOMB = 35, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
strip_delay = 8 SECONDS
put_on_delay = 6 SECONDS
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/suit/armor/bulletproof/sec
name = "security bulletproof vest"
desc = "A bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. This one has security markings on it."
icon_state = "bulletproof-sec"
item_state = "armor"
blood_overlay_type = "armor"
/obj/item/clothing/suit/armor/laserproof
name = "ablative armor vest"
code/modules/clothing/suits/miscellaneous.dm
+15
View File
@@ -417,9 +417,19 @@
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, BIO = 0, RAD = 0, FIRE = 20, ACID = 20)
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
hoodtype = /obj/item/clothing/head/hooded/winterhood/security
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/head/hooded/winterhood/security
icon_state = "winterhood_sec"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/suit/hooded/wintercoat/medical
name = "medical winter coat"
@@ -822,6 +832,11 @@
put_on_delay = 40
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, BIO = 0, RAD = 0, FIRE = 20, ACID = 20)
//End of inheritance from Security armour.
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/suit/jacket/engibomber
name = "engineering bomber jacket"