cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 22:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2829 from Woodratt/1.6.4_hathathat

Browse Source 
1.6.4 Port of Baystation head items.
This commit is contained in:
Anewbe
2016-11-26 20:24:00 -06:00
committed by GitHub
parent 1774613cf2 6dd5c9d657
commit e75b6c4b2e
12 changed files with 400 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -117,11 +117,35 @@
display_name = "cap, white"
path = /obj/item/clothing/head/soft/mime
/datum/gear/head/cap/mbill
display_name = "cap, bill"
path = /obj/item/clothing/head/soft/mbill
/datum/gear/head/cap/sol
display_name = "cap, sol"
path = /obj/item/clothing/head/soft/sol
/datum/gear/head/cap/expdition
display_name = "cap, expedition"
path = /obj/item/clothing/head/soft/sol/expedition
/datum/gear/head/cap/fleet
display_name = "cap, fleet"
path = /obj/item/clothing/head/soft/sol/fleet
/datum/gear/head/cowboy
display_name = "cowboy, rodeo"
path = /obj/item/clothing/head/cowboy_hat
cost = 3
/datum/gear/head/cowboy/black
display_name = "cowboy, black"
path = /obj/item/clothing/head/cowboy_hat/black
/datum/gear/head/cowboy/wide
display_name = "cowboy, wide"
path = /obj/item/clothing/head/cowboy_hat/wide
/datum/gear/head/fedora
display_name = "fedora, brown"
path = /obj/item/clothing/head/fedora/brown
@@ -206,7 +230,7 @@
/datum/gear/head/santahat
display_name = "santa hat, red (holiday)"
path = /obj/item/clothing/head/santa
cost = 11
cost = 2
/datum/gear/head/santahat/green
display_name = "santa hat, green (holiday)"
@@ -291,4 +315,42 @@
/datum/gear/head/bow/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/head/welding/
display_name = "welding, normal (engineering/robotics)"
path = /obj/item/clothing/head/welding
cost = 2
allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
/datum/gear/head/welding/demon
display_name = "welding, demon (engineering/robotics)"
path = /obj/item/clothing/head/welding/demon
allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
/datum/gear/head/welding/knight
display_name = "welding, knight (engineering/robotics)"
path = /obj/item/clothing/head/welding/knight
allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
/datum/gear/head/welding/fancy
display_name = "welding, fancy (engineering/robotics)"
path = /obj/item/clothing/head/welding/fancy
allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
/datum/gear/head/welding/engie
display_name = "welding, engie (engineering/robotics)"
path = /obj/item/clothing/head/welding/engie
allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
/datum/gear/head/beret/sol
display_name = "beret sol, selection"
path = /obj/item/clothing/head/beret/sol
/datum/gear/head/beret/sol/New()
..()
var/list/sols = list()
for(var/sol_style in typesof(/obj/item/clothing/head/beret/sol))
var/obj/item/clothing/head/beret/sol/sol = sol_style
sols[initial(sol.name)] = sol
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))

40
code/modules/clothing/head/helmet.dm
View File

@@ -13,6 +13,46 @@
w_class = ITEMSIZE_NORMAL
ear_protection = 1
/obj/item/clothing/head/helmet/solgov
name = "\improper Solar Confederate Government helmet"
desc = "A helmet painted in Peacekeeper blue. Stands out like a sore thumb."
icon_state = "helmet_sol"
armor = list(melee = 50, bullet = 50, laser = 50,energy = 25, bomb = 30, bio = 0, rad = 0)
/obj/item/clothing/head/helmet/solgov/command
name = "command helmet"
desc = "A helmet with 'Solar Confederate Government' printed on the back in gold lettering."
icon_state = "helmet_command"
/obj/item/clothing/head/helmet/solgov/security
name = "security helmet"
desc = "A helmet with 'MASTER AT ARMS' printed on the back in silver lettering."
icon_state = "helmet_security"
/obj/item/clothing/head/helmet/nt
name = "\improper NanoTrasen helmet"
desc = "A helmet with 'CORPORATE SECURITY' printed on the back in red lettering."
icon_state = "helmet_nt"
/obj/item/clothing/head/helmet/pcrc
name = "\improper PCRC helmet"
desc = "A helmet with 'PRIVATE SECURITY' printed on the back in cyan lettering."
icon_state = "helmet_pcrc"
/obj/item/clothing/head/helmet/tac
name = "tactical helmet"
desc = "A tan helmet made from advanced ceramic. Comfortable and robust."
icon_state = "helmet_tac"
armor = list(melee = 50, bullet = 60, laser = 60, energy = 45, bomb = 30, bio = 0, rad = 0)
siemens_coefficient = 0.6
/obj/item/clothing/head/helmet/merc
name = "combat helmet"
desc = "A heavily reinforced helmet painted with red markings. Feels like it could take a lot of punishment."
icon_state = "helmet_merc"
armor = list(melee = 70, bullet = 70, laser = 70, energy = 35, bomb = 30, bio = 0, rad = 0)
siemens_coefficient = 0.5
/obj/item/clothing/head/helmet/riot
name = "riot helmet"
desc = "It's a helmet specifically designed to protect against close range attacks."

2
code/modules/clothing/head/jobs.dm
View File

@@ -132,7 +132,7 @@
/obj/item/clothing/head/beret/engineering
name = "engineering beret"
desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
icon_state = "beret_engineering"
icon_state = "beret_orange"
/obj/item/clothing/head/beret/purple
name = "purple beret"

10
code/modules/clothing/head/misc.dm
View File

@@ -239,6 +239,16 @@
icon_state = "cowboyhat"
body_parts_covered = 0
/obj/item/clothing/head/cowboy_hat/black
name = "black cowboy hat"
desc = "You can almost hear the old western music."
icon_state = "cowboy_black"
/obj/item/clothing/head/cowboy_hat/wide
name = "wide-brimmed cowboy hat"
desc = "Because justice isn't going to dispense itself."
icon_state = "cowboy_wide"
/obj/item/clothing/head/witchwig
name = "witch costume wig"
desc = "Eeeee~heheheheheheh!"

37
code/modules/clothing/head/misc_special.dm
View File

@@ -57,6 +57,43 @@
M.update_inv_wear_mask()
usr.update_action_buttons()
/obj/item/clothing/head/welding/demon
name = "demonic welding helmet"
desc = "A painted welding helmet, this one has a demonic face on it."
icon_state = "demonwelding"
item_state_slots = list(
slot_l_hand_str = "demonwelding",
slot_r_hand_str = "demonwelding",
)
/obj/item/clothing/head/welding/knight
name = "knightly welding helmet"
desc = "A painted welding helmet, this one looks like a knights helmet."
icon_state = "knightwelding"
item_state_slots = list(
slot_l_hand_str = "knightwelding",
slot_r_hand_str = "knightwelding",
)
/obj/item/clothing/head/welding/fancy
name = "fancy welding helmet"
desc = "A painted welding helmet, the black and gold make this one look very fancy."
icon_state = "fancywelding"
item_state_slots = list(
slot_l_hand_str = "fancywelding",
slot_r_hand_str = "fancywelding",
)
/obj/item/clothing/head/welding/engie
name = "engineering welding helmet"
desc = "A painted welding helmet, this one has been painted the engineering colours."
icon_state = "engiewelding"
item_state_slots = list(
slot_l_hand_str = "engiewelding",
slot_r_hand_str = "engiewelding",
)
.
/*
* Cakehat
*/

7
code/modules/clothing/head/soft_caps.dm
View File

@@ -92,4 +92,9 @@
name = "black cap"
desc = "It's a peaked cap in a tasteful black color."
icon_state = "blacksoft"
item_state_slots = list(slot_r_hand_str = "blacksoft", slot_l_hand_str = "blacksoft")
item_state_slots = list(slot_r_hand_str = "blacksoft", slot_l_hand_str = "blacksoft")
/obj/item/clothing/head/soft/mbill
name = "shipping cap"
desc = "It's a ballcap bearing the colors of Major Bill's Shipping."
icon_state = "mbillsoft"

241
code/modules/clothing/head/solgov.dm Normal file
View File

@@ -0,0 +1,241 @@
//SolGov uniform hats
//Utility
/obj/item/clothing/head/soft/sol
name = "\improper SolGov cap"
desc = "It's a blue ballcap in Solar Confederate Government colors."
icon_state = "solsoft"
item_state_slots = list(
slot_l_hand_str = "lightbluesoft",
slot_r_hand_str = "lightbluesoft",
)
/obj/item/clothing/head/soft/sol/expedition
name = "\improper Expeditionary Corps cap"
desc = "It's a black ballcap bearing a Expeditonary Corps crest."
icon_state = "expeditionsoft"
item_state_slots = list(
slot_l_hand_str = "blacksoft",
slot_r_hand_str = "blacksoft",
)
/obj/item/clothing/head/soft/sol/fleet
name = "fleet cap"
desc = "It's a navy blue ballcap with a SCG Fleet crest."
icon_state = "fleetsoft"
item_state_slots = list(
slot_l_hand_str = "darkbluesoft",
slot_r_hand_str = "darkbluesoft",
)
/obj/item/clothing/head/utility
name = "utility cover"
desc = "An eight-point utility cover."
icon_state = "greyutility"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/utility/fleet
name = "fleet utility cover"
desc = "A navy blue utility cover bearing the crest of a SCG Fleet."
icon_state = "navyutility"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
/obj/item/clothing/head/utility/marine
name = "marine utility cover"
desc = "A grey utility cover bearing the crest of the SCG Marine Corps."
icon_state = "greyutility"
armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/head/utility/marine/tan
name = "tan utility cover"
desc = "A tan utility cover bearing the crest of the SCG Marine Corps."
icon_state = "tanutility"
/obj/item/clothing/head/utility/marine/green
name = "green utility cover"
desc = "A green utility cover bearing the crest of the SCG Marine Corps."
icon_state = "greenutility"
//Service
/obj/item/clothing/head/service
name = "service cover"
desc = "A service uniform cover."
icon_state = "greenwheelcap"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/service/marine
name = "marine wheel cover"
desc = "A green service uniform cover with an SCG Marine Corps crest."
icon_state = "greenwheelcap"
/obj/item/clothing/head/service/marine/command
name = "marine officer's wheel cover"
desc = "A green service uniform cover with an SCG Marine Corps crest and gold stripe."
icon_state = "greenwheelcap_com"
/obj/item/clothing/head/service/marine/garrison
name = "marine garrison cap"
desc = "A green garrison cap belonging to the SCG Marine Corps."
icon_state = "greengarrisoncap"
/obj/item/clothing/head/service/marine/garrison/command
name = "marine officer's garrison cap"
desc = "A green garrison cap belonging to the SCG Marine Corps. This one has a gold pin."
icon_state = "greengarrisoncap_com"
/obj/item/clothing/head/service/marine/campaign
name = "campaign cover"
desc = "A green campaign cover with an SCG Marine Corps crest. Only found on the heads of Drill Instructors."
icon_state = "greendrill"
//Dress
/obj/item/clothing/head/dress
name = "dress cover"
desc = "A dress uniform cover."
icon_state = "greenwheelcap"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/dress/expedition
name = "expedition dress cap"
desc = "A peaked grey dress uniform cap belonging to the SCG Expeditionary Corps."
icon_state = "greydresscap"
/obj/item/clothing/head/dress/expedition/command
name = "expedition command dress cap"
desc = "A peaked grey dress uniform cap belonging to the SCG Expeditionary Corps. This one is trimmed in gold."
icon_state = "greydresscap_com"
/obj/item/clothing/head/dress/fleet
name = "fleet dress wheel cover"
desc = "A white dress uniform cover. This one has an SCG Fleet crest."
icon_state = "whitepeakcap"
/obj/item/clothing/head/dress/fleet/command
name = "fleet command dress wheel cover"
desc = "A white dress uniform cover. This one has a gold stripe and an SCG Fleet crest."
icon_state = "whitepeakcap_com"
/obj/item/clothing/head/dress/marine
name = "marine dress wheel cover"
desc = "A white dress uniform cover with an SCG Marine Corps crest."
icon_state = "whitewheelcap"
/obj/item/clothing/head/dress/marine/command
name = "marine officer's dress wheel cover"
desc = "A white dress uniform cover with an SCG Marine Corps crest and gold stripe."
icon_state = "whitewheelcap_com"
//Berets
/obj/item/clothing/head/beret/sol
name = "peacekeeper beret"
desc = "A beret in Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety."
icon_state = "beret_lightblue"
/obj/item/clothing/head/beret/sol/homeguard
name = "home guard beret"
desc = "A red beret denoting service in the Sol Home Guard. For personnel that are more inclined towards style than safety."
icon_state = "beret_red"
/obj/item/clothing/head/beret/sol/gateway
name = "gateway administration beret"
desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety."
icon_state = "beret_orange"
/obj/item/clothing/head/beret/sol/customs
name = "customs and trade beret"
desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety."
icon_state = "beret_purpleyellow"
/obj/item/clothing/head/beret/sol/orbital
name = "orbital assault beret"
desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety."
icon_state = "beret_blue"
/obj/item/clothing/head/beret/sol/research
name = "government research beret"
desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety."
icon_state = "beret_green"
/obj/item/clothing/head/beret/sol/health
name = "health service beret"
desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety."
icon_state = "beret_white"
/obj/item/clothing/head/beret/sol/expedition
name = "expeditionary beret"
desc = "A black beret belonging to the SCG Expeditionary Corps. For personnel that are more inclined towards style than safety."
icon_state = "beret_black"
/obj/item/clothing/head/beret/sol/expedition/security
name = "expeditionary security beret"
desc = "An SCG Expeditionary Corps beret with a security crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_security"
/obj/item/clothing/head/beret/sol/expedition/medical
name = "expeditionary medical beret"
desc = "An SCG Expeditionary Corps beret with a medical crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_medical"
/obj/item/clothing/head/beret/sol/expedition/engineering
name = "expeditionary engineering beret"
desc = "An SCG Expeditionary Corps beret with an engineering crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_engineering"
/obj/item/clothing/head/beret/sol/expedition/supply
name = "expeditionary supply beret"
desc = "An SCG Expeditionary Corps beret with a supply crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_supply"
/obj/item/clothing/head/beret/sol/expedition/command
name = "expeditionary command beret"
desc = "An SCG Expeditionary Corps beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_command"
/obj/item/clothing/head/beret/sol/fleet
name = "fleet beret"
desc = "A navy blue beret belonging to the SCG Fleet. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy"
/obj/item/clothing/head/beret/sol/fleet/security
name = "fleet security beret"
desc = "An SCG Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_security"
/obj/item/clothing/head/beret/sol/fleet/medical
name = "fleet medical beret"
desc = "An SCG Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_medical"
/obj/item/clothing/head/beret/sol/fleet/engineering
name = "fleet engineering beret"
desc = "An SCG Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_engineering"
/obj/item/clothing/head/beret/sol/fleet/supply
name = "fleet supply beret"
desc = "An SCG Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_supply"
/obj/item/clothing/head/beret/sol/fleet/command
name = "fleet command beret"
desc = "An SCG Fleet beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_command"