mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-25 01:22:24 +00:00
Merge pull request #2836 from Woodratt/1.6.5_Uniforms
1.6.5 Port of Bay's uniforms
This commit is contained in:
Anewbe
GitHub
@@ -2545,7 +2545,7 @@ area/space/atmosalert()
|
||||
|
||||
/area/tcomfoyer
|
||||
name = "\improper Telecomms Foyer"
|
||||
icon_state = "tcomsatentrance"
|
||||
icon_state = "tcomsatfoyer"
|
||||
ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
|
||||
|
||||
/area/tcomwest
|
||||
|
||||
@@ -380,4 +380,68 @@
|
||||
|
||||
/datum/gear/uniform/dresses/janimaid
|
||||
display_name = "maid uniform"
|
||||
path = /obj/item/clothing/under/dress/janimaid
|
||||
path = /obj/item/clothing/under/dress/janimaid
|
||||
|
||||
/datum/gear/uniform/pt
|
||||
display_name = "pt uniform"
|
||||
path = /obj/item/clothing/under/pt
|
||||
|
||||
/datum/gear/uniform/pt/expeditionary
|
||||
display_name = "pt uniform, expeditionary"
|
||||
path = /obj/item/clothing/under/pt/expeditionary
|
||||
|
||||
/datum/gear/uniform/pt/fleet
|
||||
display_name = "pt uniform, fleet"
|
||||
path = /obj/item/clothing/under/pt/fleet
|
||||
|
||||
/datum/gear/uniform/utility
|
||||
display_name = "utility, black"
|
||||
path = /obj/item/clothing/under/utility
|
||||
cost = 2
|
||||
|
||||
/datum/gear/uniform/utility/fleet
|
||||
display_name = "utility, navy"
|
||||
path = /obj/item/clothing/under/utility/fleet
|
||||
|
||||
/datum/gear/uniform/utility/marine
|
||||
display_name = "utility, grey"
|
||||
path = /obj/item/clothing/under/utility/marine
|
||||
|
||||
/datum/gear/uniform/sweater
|
||||
display_name = "sweater, grey"
|
||||
path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
|
||||
|
||||
/datum/gear/uniform/jumpsuit/aether
|
||||
display_name = "jumpsuit, aether"
|
||||
path = /obj/item/clothing/under/aether
|
||||
|
||||
/datum/gear/uniform/jumpsuit/focal
|
||||
display_name = "jumpsuit, focal"
|
||||
path = /obj/item/clothing/under/focal
|
||||
|
||||
/datum/gear/uniform/mbill
|
||||
display_name = "outfit, major bill's (Cargo)"
|
||||
path = /obj/item/clothing/under/mbill
|
||||
allowed_roles = list("Quartermaster","Cargo Technician")
|
||||
|
||||
/datum/gear/uniform/pcrc
|
||||
display_name = "uniform, PCRC (Security)"
|
||||
path = /obj/item/clothing/under/pcrc
|
||||
cost = 2
|
||||
allowed_roles = list("Security Officer","Head of Security","Warden")
|
||||
|
||||
/datum/gear/uniform/jumpsuit/grayson
|
||||
display_name = "outfit, grayson"
|
||||
path = /obj/item/clothing/under/grayson
|
||||
|
||||
/datum/gear/uniform/jumpsuit/wardt
|
||||
display_name = "jumpsuit, ward-takahashi"
|
||||
path = /obj/item/clothing/under/wardt
|
||||
|
||||
/datum/gear/uniform/frontier
|
||||
display_name = "outfit, frontier"
|
||||
path = /obj/item/clothing/under/frontier
|
||||
|
||||
/datum/gear/uniform/jumpsuit/hephaestus
|
||||
display_name = "jumpsuit, hephaestus"
|
||||
path = /obj/item/clothing/under/hephaestus
|
||||
@@ -91,7 +91,7 @@
|
||||
item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
|
||||
|
||||
/obj/item/clothing/under/gov
|
||||
desc = "A neat proper uniform of someone on offical business. The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
|
||||
desc = "A neat proper uniform of someone on offical business. The collar is <i>immaculately</i> starched."
|
||||
name = "Green formal uniform"
|
||||
icon_state = "greensuit"
|
||||
item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom")
|
||||
@@ -607,17 +607,88 @@
|
||||
/obj/item/clothing/under/stripper/stripper_pink
|
||||
name = "pink swimsuit"
|
||||
desc = "A rather skimpy pink swimsuit."
|
||||
icon_state = "stripper_p_under"
|
||||
icon_state = "stripper_p"
|
||||
siemens_coefficient = 1
|
||||
|
||||
/obj/item/clothing/under/stripper/stripper_green
|
||||
name = "green swimsuit"
|
||||
desc = "A rather skimpy green swimsuit."
|
||||
icon_state = "stripper_g_under"
|
||||
icon_state = "stripper_g"
|
||||
siemens_coefficient = 1
|
||||
|
||||
/obj/item/clothing/under/stripper/mankini
|
||||
name = "mankini"
|
||||
desc = "No honest man would wear this abomination"
|
||||
icon_state = "mankini"
|
||||
siemens_coefficient = 1
|
||||
siemens_coefficient = 1
|
||||
|
||||
/*
|
||||
*Misc Uniforms
|
||||
*/
|
||||
|
||||
/obj/item/clothing/under/aether
|
||||
name = "\improper Aether jumpsuit"
|
||||
desc = "A jumpsuit belonging to Aether Atmospherics and Recycling, a Trans-Stellar that supplies recycling and atmospheric systems to colonies."
|
||||
icon_state = "aether"
|
||||
worn_state = "aether"
|
||||
|
||||
/obj/item/clothing/under/pcrc
|
||||
name = "\improper PCRC uniform"
|
||||
desc = "A uniform belonging to Proxima Centauri Risk Control, a private security firm."
|
||||
icon_state = "pcrc"
|
||||
item_state = "jensensuit"
|
||||
worn_state = "pcrc"
|
||||
|
||||
/obj/item/clothing/under/grayson
|
||||
name = "\improper Grayson overalls"
|
||||
desc = "A set of overalls belonging to Grayson Manufactories, a mining Trans-Stellar."
|
||||
icon_state = "mechanic"
|
||||
worn_state = "mechanic"
|
||||
|
||||
/obj/item/clothing/under/wardt
|
||||
name = "\improper Ward-Takahashi jumpsuit"
|
||||
desc = "A jumpsuit belonging to Ward-Takahashi, a Trans-Stellar in the consumer goods market."
|
||||
icon_state = "robotics2"
|
||||
worn_state = "robotics2"
|
||||
|
||||
/obj/item/clothing/under/mbill
|
||||
name = "\improper Major Bill's uniform"
|
||||
desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation."
|
||||
icon_state = "mbill"
|
||||
worn_state = "mbill"
|
||||
|
||||
/obj/item/clothing/under/confederacy
|
||||
name = "\improper Confederacy uniform"
|
||||
desc = "A military uniform belonging to the Confederacy of Man, an independent human government."
|
||||
icon_state = "confed"
|
||||
worn_state = "confed"
|
||||
|
||||
/obj/item/clothing/under/saare
|
||||
name = "\improper SAARE uniform"
|
||||
desc = "A dress uniform belonging to Stealth Assault Enterprises, a minor private military corporation."
|
||||
icon_state = "saare"
|
||||
worn_state = "saare"
|
||||
|
||||
/obj/item/clothing/under/frontier
|
||||
name = "frontier clothes"
|
||||
desc = "A rugged flannel shirt and denim overalls. A popular style among frontier colonists."
|
||||
icon_state = "frontier"
|
||||
worn_state = "frontier"
|
||||
|
||||
/obj/item/clothing/under/focal
|
||||
name = "\improper Focal Point jumpsuit"
|
||||
desc = "A jumpsuit belonging to Focal Point Energistics, an engineering megacorporation."
|
||||
icon_state = "focal"
|
||||
worn_state = "focal"
|
||||
|
||||
/obj/item/clothing/under/hephaestus
|
||||
name = "\improper Hephaestus jumpsuit"
|
||||
desc = "A jumpsuit belonging to Hephaestus Industries, a Trans-Stellar best known for its arms production."
|
||||
icon_state = "heph"
|
||||
worn_state = "heph"
|
||||
|
||||
/obj/item/clothing/under/rank/psych/turtleneck/sweater
|
||||
desc = "A warm looking sweater and a pair of dark blue slacks."
|
||||
name = "sweater"
|
||||
icon_state = "turtleneck"
|
||||
worn_state = "turtleneck"
|
||||
265
code/modules/clothing/under/solgov.dm
Normal file
265
code/modules/clothing/under/solgov.dm
Normal file
@@ -0,0 +1,265 @@
|
||||
//SolGov Uniforms
|
||||
|
||||
//PT
|
||||
/obj/item/clothing/under/pt
|
||||
name = "pt uniform"
|
||||
desc = "Shorts! Shirt! Miami! Sexy!"
|
||||
icon_state = "miami"
|
||||
worn_state = "miami"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
siemens_coefficient = 0.9
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
|
||||
/obj/item/clothing/under/pt/expeditionary
|
||||
name = "expeditionary pt uniform"
|
||||
desc = "A baggy shirt bearing the seal of the SCG Expeditionary Corps and some dorky looking blue shorts."
|
||||
icon_state = "expeditionpt"
|
||||
worn_state = "expeditionpt"
|
||||
|
||||
/obj/item/clothing/under/pt/fleet
|
||||
name = "fleet pt uniform"
|
||||
desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though."
|
||||
icon_state = "fleetpt"
|
||||
worn_state = "fleetpt"
|
||||
|
||||
/obj/item/clothing/under/pt/marine
|
||||
name = "marine pt uniform"
|
||||
desc = "Does NOT leave much to the imagination."
|
||||
icon_state = "marinept"
|
||||
worn_state = "marinept"
|
||||
|
||||
|
||||
//Utility
|
||||
|
||||
/obj/item/clothing/under/utility
|
||||
name = "utility uniform"
|
||||
desc = "A comfortable turtleneck and black utility trousers."
|
||||
icon_state = "blackutility"
|
||||
worn_state = "blackutility"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
siemens_coefficient = 0.9
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary
|
||||
name = "expeditionary uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has silver trim."
|
||||
icon_state = "blackutility_crew"
|
||||
worn_state = "blackutility_crew"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary/medical
|
||||
name = "expeditionary medical uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has silver trim and blue blazes."
|
||||
icon_state = "blackutility_med"
|
||||
worn_state = "blackutility_med"
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary/medical/command
|
||||
name = "expeditionary medical command uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has gold trim and blue blazes."
|
||||
icon_state = "blackutility_medcom"
|
||||
worn_state = "blackutility_medcom"
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary/engineering
|
||||
name = "expeditionary engineering uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has silver trim and organge blazes."
|
||||
icon_state = "blackutility_eng"
|
||||
worn_state = "blackutility_eng"
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary/engineering/command
|
||||
name = "expeditionary engineering command uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has gold trim and organge blazes."
|
||||
icon_state = "blackutility_engcom"
|
||||
worn_state = "blackutility_engcom"
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary/supply
|
||||
name = "expeditionary supply uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has silver trim and brown blazes."
|
||||
icon_state = "blackutility_sup"
|
||||
worn_state = "blackutility_sup"
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary/security
|
||||
name = "expeditionary security uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has silver trim and red blazes."
|
||||
icon_state = "blackutility_sec"
|
||||
worn_state = "blackutility_sec"
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary/security/command
|
||||
name = "expeditionary security command uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has gold trim and red blazes."
|
||||
icon_state = "blackutility_seccom"
|
||||
worn_state = "blackutility_seccom"
|
||||
|
||||
/obj/item/clothing/under/utility/expeditionary/command
|
||||
name = "expeditionary command uniform"
|
||||
desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has gold trim and gold blazes."
|
||||
icon_state = "blackutility_com"
|
||||
worn_state = "blackutility_com"
|
||||
|
||||
|
||||
/obj/item/clothing/under/utility/fleet
|
||||
name = "fleet coveralls"
|
||||
desc = "The utility uniform of the SCG Fleet, made from an insulated material."
|
||||
icon_state = "navyutility"
|
||||
worn_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/under/utility/fleet/medical
|
||||
name = "fleet medical coveralls"
|
||||
desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has blue cuffs."
|
||||
icon_state = "navyutility_med"
|
||||
worn_state = "navyutility_med"
|
||||
|
||||
/obj/item/clothing/under/utility/fleet/engineering
|
||||
name = "fleet engineering coveralls"
|
||||
desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has orange cuffs."
|
||||
icon_state = "navyutility_eng"
|
||||
worn_state = "navyutility_eng"
|
||||
|
||||
/obj/item/clothing/under/utility/fleet/supply
|
||||
name = "fleet supply coveralls"
|
||||
desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has brown cuffs."
|
||||
icon_state = "navyutility_sup"
|
||||
worn_state = "navyutility_sup"
|
||||
|
||||
/obj/item/clothing/under/utility/fleet/security
|
||||
name = "fleet security coveralls"
|
||||
desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has red cuffs."
|
||||
icon_state = "navyutility_sec"
|
||||
worn_state = "navyutility_sec"
|
||||
|
||||
/obj/item/clothing/under/utility/fleet/command
|
||||
name = "fleet command coveralls"
|
||||
desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has gold cuffs."
|
||||
icon_state = "navyutility_com"
|
||||
worn_state = "navyutility_com"
|
||||
|
||||
|
||||
/obj/item/clothing/under/utility/marine
|
||||
name = "marine fatigues"
|
||||
desc = "The utility uniform of the SCG Marine Corps, made from durable material."
|
||||
icon_state = "greyutility"
|
||||
worn_state = "greyutility"
|
||||
armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/clothing/under/utility/marine/green
|
||||
name = "green fatigues"
|
||||
desc = "A green version of the SCG marine utility uniform, made from durable material."
|
||||
icon_state = "greenutility"
|
||||
worn_state = "greenutility"
|
||||
|
||||
/obj/item/clothing/under/utility/marine/tan
|
||||
name = "tan fatigues"
|
||||
desc = "A tan version of the SCG marine utility uniform, made from durable material."
|
||||
icon_state = "tanutility"
|
||||
worn_state = "tanutility"
|
||||
|
||||
/obj/item/clothing/under/utility/marine/medical
|
||||
name = "marine medical fatigues"
|
||||
desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has blue markings."
|
||||
icon_state = "greyutility_med"
|
||||
worn_state = "greyutility_med"
|
||||
|
||||
/obj/item/clothing/under/utility/marine/engineering
|
||||
name = "marine engineering fatigues"
|
||||
desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has orange markings."
|
||||
icon_state = "greyutility_eng"
|
||||
worn_state = "greyutility_eng"
|
||||
|
||||
/obj/item/clothing/under/utility/marine/supply
|
||||
name = "marine supply fatigues"
|
||||
desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has brown markings."
|
||||
icon_state = "greyutility_sup"
|
||||
worn_state = "greyutility_sup"
|
||||
|
||||
/obj/item/clothing/under/utility/marine/security
|
||||
name = "marine security fatigues"
|
||||
desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has red markings."
|
||||
icon_state = "greyutility_sec"
|
||||
worn_state = "greyutility_sec"
|
||||
|
||||
/obj/item/clothing/under/utility/marine/command
|
||||
name = "marine command coveralls"
|
||||
desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has gold markings."
|
||||
icon_state = "greyutility_com"
|
||||
worn_state = "greyutility_com"
|
||||
|
||||
//Service
|
||||
|
||||
/obj/item/clothing/under/service
|
||||
name = "service uniform"
|
||||
desc = "A service uniform of some kind."
|
||||
icon_state = "whiteservice"
|
||||
worn_state = "whiteservice"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
siemens_coefficient = 0.9
|
||||
|
||||
/obj/item/clothing/under/service/fleet
|
||||
name = "fleet service uniform"
|
||||
desc = "The service uniform of the SCG Fleet, made from immaculate white fabric."
|
||||
icon_state = "whiteservice"
|
||||
worn_state = "whiteservice"
|
||||
|
||||
/obj/item/clothing/under/service/marine
|
||||
name = "marine service uniform"
|
||||
desc = "The service uniform of the SCG Marine Corps. Slimming."
|
||||
icon_state = "greenservice"
|
||||
worn_state = "greenservice"
|
||||
|
||||
/obj/item/clothing/under/service/marine/command
|
||||
name = "marine command service uniform"
|
||||
desc = "The service uniform of the SCG Marine Corps. Slimming and stylish."
|
||||
icon_state = "greenservice_com"
|
||||
worn_state = "greenservice_com"
|
||||
|
||||
//Dress
|
||||
/obj/item/clothing/under/dress
|
||||
name = "dress uniform"
|
||||
desc = "A dress uniform of some kind."
|
||||
icon_state = "greydress"
|
||||
worn_state = "greydress"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
siemens_coefficient = 0.9
|
||||
|
||||
/obj/item/clothing/under/dress/expeditionary
|
||||
name = "expeditionary dress uniform"
|
||||
desc = "The dress uniform of the SCG Expeditionary Corps in silver trim."
|
||||
icon_state = "greydress"
|
||||
worn_state = "greydress"
|
||||
|
||||
/obj/item/clothing/under/dress/expeditionary/command
|
||||
name = "expeditionary command dress uniform"
|
||||
desc = "The dress uniform of the SCG Expeditionary Corps in gold trim."
|
||||
icon_state = "greydress_com"
|
||||
worn_state = "greydress_com"
|
||||
|
||||
/obj/item/clothing/under/dress/marine
|
||||
name = "marine dress uniform"
|
||||
desc = "The dress uniform of the SCG Marine Corps, class given form."
|
||||
icon_state = "blackdress"
|
||||
worn_state = "blackdress"
|
||||
|
||||
/obj/item/clothing/under/dress/marine/command
|
||||
name = "marine command dress uniform"
|
||||
desc = "The dress uniform of the SCG Marine Corps, even classier in gold."
|
||||
icon_state = "blackdress_com"
|
||||
worn_state = "blackdress_com"
|
||||
|
||||
|
||||
//Misc
|
||||
|
||||
/obj/item/clothing/under/hazard
|
||||
name = "hazard jumpsuit"
|
||||
desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
|
||||
icon_state = "hazard"
|
||||
worn_state = "hazard"
|
||||
siemens_coefficient = 0.8
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 20, bio = 0, rad = 20)
|
||||
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
|
||||
/obj/item/clothing/under/sterile
|
||||
name = "sterile jumpsuit"
|
||||
desc = "A sterile white jumpsuit with medical markings. Protects against all manner of biohazards."
|
||||
icon_state = "sterile"
|
||||
worn_state = "sterile"
|
||||
permeability_coefficient = 0.50
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 0)
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 366 KiB After Width: | Height: | Size: 422 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 94 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
@@ -1246,6 +1246,7 @@
|
||||
#include "code\modules\clothing\under\miscellaneous.dm"
|
||||
#include "code\modules\clothing\under\pants.dm"
|
||||
#include "code\modules\clothing\under\shorts.dm"
|
||||
#include "code\modules\clothing\under\solgov.dm"
|
||||
#include "code\modules\clothing\under\syndicate.dm"
|
||||
#include "code\modules\clothing\under\accessories\accessory.dm"
|
||||
#include "code\modules\clothing\under\accessories\armband.dm"
|
||||
|
||||
Reference in New Issue
Block a user