Merge pull request #12570 from NopemanMcHalt/orvilike_bonus

Adds Kepi and Orvilike Kepi
This commit is contained in:
silicons
2020-06-24 08:43:03 -07:00
committed by GitHub
5 changed files with 73 additions and 0 deletions

View File

@@ -437,3 +437,12 @@
item_state = "hunter"
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/head/kepi
name = "kepi"
desc = "A white cap with visor. Oui oui, mon capitane!"
icon_state = "kepi"
/obj/item/clothing/head/kepi/old
icon_state = "kepi_old"
desc = "A flat, white circular cap with a visor, that demands some honor from it's wearer."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 KiB

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

View File

@@ -98,6 +98,46 @@
restricted_desc = "Engineering, Security, and Cargo"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
// orvilike "original" kepi
/datum/gear/orvkepicom
name = "Federation Kepi, command"
description = "A visored cap. Intended to be used with ORV uniform."
category = SLOT_HEAD
path = /obj/item/clothing/head/kepi/orvi/command
restricted_desc = "Heads of Staff"
restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
/datum/gear/orvkepiops
name = "Federation Kepi, ops/sec"
description = "A visored cap. Intended to be used with ORV uniform."
category = SLOT_HEAD
path = /obj/item/clothing/head/kepi/orvi/engsec
restricted_desc = "Engineering, Security and Cargo"
restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
/datum/gear/orvkepimedsci
name = "Federation Kepi, medsci"
description = "A visored cap. Intended to be used with ORV uniform."
category = SLOT_HEAD
path = /obj/item/clothing/head/kepi/orvi/medsci
restricted_desc = "Medical and Science"
restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist")
/datum/gear/orvkepisrv
name = "Federation Kepi, service"
description = "A visored cap. Intended to be used with ORV uniform."
category = SLOT_HEAD
path = /obj/item/clothing/head/kepi/orvi/service
restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
/datum/gear/orvkepiass
name = "Federation Kepi, assistant"
description = "A visored cap. Intended to be used with ORV uniform."
category = SLOT_HEAD
path = /obj/item/clothing/head/kepi/orvi
restricted_roles = list("Assistant")
/*Commenting out Until next Christmas or made automatic
/datum/gear/santahatr
name = "Red Santa Hat"
@@ -137,3 +177,9 @@
path = /obj/item/clothing/head/cowboyhat/sec
restricted_desc = "Security"
restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
// Misc
/datum/gear/wkepi
name = "white kepi"
category = SLOT_HEAD
path = /obj/item/clothing/head/kepi

View File

@@ -162,3 +162,21 @@
/obj/item/clothing/head/caphat/formal/fedcover/black
icon_state = "fedcapblack"
item_state = "fedcapblack"
//orvilike caps
/obj/item/clothing/head/kepi/orvi
name = "\improper Federation kepi"
desc = "A visored cap worn by all officers since 2550s."
icon_state = "kepi_ass"
/obj/item/clothing/head/kepi/orvi/command
icon_state = "kepi_com"
/obj/item/clothing/head/kepi/orvi/engsec
icon_state = "kepi_ops"
/obj/item/clothing/head/kepi/orvi/medsci
icon_state = "kepi_medsci"
/obj/item/clothing/head/kepi/orvi/service
icon_state = "kepi_srv"