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

Merge pull request #11280 from Ionward/mantles

Browse Source 
Adds suit-slot cosmetic mantles!
This commit is contained in:
Fox McCloud
2019-04-11 00:43:29 -04:00
committed by GitHub
parent 8ad075024d 54536350c7
commit 112129779c
12 changed files with 128 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/loadout_suit.dm
+43
View File
@@ -158,3 +158,46 @@
/datum/gear/suit/purplesuit
display_name = "suit jacket, purple"
path = /obj/item/clothing/suit/storage/lawyer/purpjacket
//Mantles!
/datum/gear/suit/mantle
display_name = "mantle"
path = /obj/item/clothing/suit/mantle
/datum/gear/suit/old_scarf
display_name = "old scarf"
path = /obj/item/clothing/suit/mantle/old
/datum/gear/suit/regal_shawl
display_name = "regal shawl"
path = /obj/item/clothing/suit/mantle/regal
/datum/gear/suit/captain_cloak
display_name = "mantle, captain"
path = /obj/item/clothing/suit/mantle/armor/captain
allowed_roles = list("Captain")
/datum/gear/suit/ce_mantle
display_name = "mantle, chief engineer"
path = /obj/item/clothing/suit/mantle/chief_engineer
allowed_roles = list("Chief Engineer")
/datum/gear/suit/cmo_mantle
display_name = "mantle, chief medical officer"
path = /obj/item/clothing/suit/mantle/labcoat/chief_medical_officer
allowed_roles = list("Chief Medical Officer")
/datum/gear/suit/armored_shawl
display_name = "mantle, head of security"
path = /obj/item/clothing/suit/mantle/armor
allowed_roles = list("Head of Security")
/datum/gear/suit/hop_shawl
display_name = "mantle, head of personnel"
path = /obj/item/clothing/suit/mantle/armor/head_of_personnel
allowed_roles = list("Head of Personnel")
/datum/gear/suit/rd_mantle
display_name = "mantle, research director"
path = /obj/item/clothing/suit/mantle/labcoat
allowed_roles = list("Research Director")
code/modules/clothing/suits/jobs.dm
+55 -2
View File
@@ -59,7 +59,6 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
/obj/item/clothing/suit/captunic/capjacket
name = "captain's uniform jacket"
desc = "A less formal jacket for everyday captain use."
@@ -72,6 +71,13 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
/obj/item/clothing/suit/mantle/armor/captain
name = "captain's cloak"
desc = "An armor-plated piece of fashion for the ruling elite. Protect your upper half in style."
icon_state = "capmantle"
item_state = "capmantle"
armor = list(melee = 50, bullet = 40, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
//Chaplain
/obj/item/clothing/suit/hooded/chaplain_hoodie
name = "chaplain hoodie"
@@ -151,6 +157,21 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
allowed = list(/obj/item/kitchen/knife)
//Chief Engineer
/obj/item/clothing/suit/mantle/chief_engineer
name = "chief engineer's mantle"
desc = "A slick, authoritative cloak designed for the Chief Engineer."
icon_state = "cemantle"
item_state = "cemantle"
allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd)
//Chief Medical Officer
/obj/item/clothing/suit/mantle/labcoat/chief_medical_officer
name = "chief medical officer's mantle"
desc = "An absorbent, clean cover found on the shoulders of the Chief Medical Officer."
icon_state = "cmomantle"
item_state = "cmomantle"
//Detective
/obj/item/clothing/suit/storage/det_suit
name = "coat"
@@ -159,7 +180,7 @@
item_state = "det_suit"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/reagent_containers/spray/pepper,/obj/item/flashlight,/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/lighter,/obj/item/detective_scanner,/obj/item/taperecorder)
allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/reagent_containers/spray/pepper, /obj/item/flashlight, /obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/detective_scanner, /obj/item/taperecorder)
armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
@@ -259,6 +280,29 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
//Head of Security
/obj/item/clothing/suit/mantle/armor
name = "armored shawl"
desc = "A reinforced shawl, worn by the Head of Security. Do you dare take up their mantle?"
icon_state = "hosmantle"
item_state = "hosmantle"
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, /obj/item/kitchen/knife/combat)
armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0)
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = UPPER_TORSO|ARMS
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
burn_state = FIRE_PROOF
//Head of Personnel
/obj/item/clothing/suit/mantle/armor/head_of_personnel
name = "head of personnel's shawl"
desc = "An armored shawl for the head of personnel. It's remarkably well kept."
icon_state = "hopmantle"
item_state = "hopmantle"
armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
//Internal Affairs
/obj/item/clothing/suit/storage/internalaffairs
name = "\improper Internal Affairs jacket"
@@ -320,3 +364,12 @@
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
//Research Director
/obj/item/clothing/suit/mantle/labcoat
name = "research director's mantle"
desc = "A tweed mantle, worn by the Research Director. Smells like science."
icon_state = "rdmantle"
item_state = "rdmantle"
allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/rad_laser)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 0)
code/modules/clothing/suits/miscellaneous.dm
+23
View File
@@ -972,3 +972,26 @@
name = "ladies red victorian coat"
icon_state = "ladiesredvictoriancoat"
item_state = "ladiesredvictoriancoat"
//Mantles!
/obj/item/clothing/suit/mantle
name = "mantle"
desc = "A heavy quilted mantle, for keeping your shoulders warm and stylish."
icon_state = "mantle"
item_state = "mantle"
body_parts_covered = UPPER_TORSO|ARMS
cold_protection = UPPER_TORSO|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
/obj/item/clothing/suit/mantle/regal
name = "regal shawl"
desc = "A fancy shawl for nobility, made from high quality materials."
icon_state = "regal_mantle"
item_state = "regal_mantle"
/obj/item/clothing/suit/mantle/old
name = "old wrap"
desc = "A tattered fabric wrap, faded over the years. Smells faintly of cigars."
icon_state = "old_mantle"
item_state = "old_mantle"