diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index eac0708ded..a568953aeb 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -74,9 +74,7 @@ synth_survivor_types = list( /datum/equipment_preset/synth/survivor/medical_synth, /datum/equipment_preset/synth/survivor/emt_synth, - /datum/equipment_preset/synth/survivor/scientist_synth, - /datum/equipment_preset/synth/survivor/engineer_synth, - /datum/equipment_preset/synth/survivor/freelancer_synth, +, /datum/equipment_preset/synth/survivor/wy/security_synth, /datum/equipment_preset/synth/survivor/wy/protection_synth, /datum/equipment_preset/synth/survivor/wy/corporate_synth, diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 630879b3c7..358dbb81e5 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -1058,17 +1058,8 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro new /obj/item/reagent_container/food/drinks/bottle/kahlua(loc) new /obj/item/reagent_container/food/drinks/bottle/rum(loc) loot_message = SPAN_NOTICE("It's a bunch of finished and unfinished molotovs.") - if(41 to 45) - // Spare CLF gear! - new /obj/effect/essentials_set/random/clf_shoes(loc) - new /obj/item/clothing/under/boiler/grey(loc) - new /obj/effect/essentials_set/random/clf_armor(loc) - new /obj/effect/essentials_set/random/clf_gloves(loc) - new /obj/effect/essentials_set/random/clf_head(loc) - new /obj/effect/essentials_set/random/clf_belt(loc) - loot_message = SPAN_NOTICE("It's a spare set of CLF equipment. You probably shouldn't wear this...") // That was the good 50%. Now it's time for the bad. - if(46 to 50) + if(41 to 50) // Random junk new /obj/effect/essentials_set/random/clf_bonus_item(loc) new /obj/effect/essentials_set/random/clf_bonus_item(loc) diff --git a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm index 759cc9f5e4..b04a9f5422 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm @@ -39,62 +39,3 @@ listed_products[/datum/equipment_preset/clf] = GLOB.gear_path_presets_list[/datum/equipment_preset/clf].get_antag_clothing_equipment() products_sets = listed_products[/datum/equipment_preset/clf] return products_sets - -//--------------RANDOM EQUIPMENT AND GEAR------------------------ - -/obj/effect/essentials_set/random/clf_shoes - spawned_gear_list = list( - /obj/item/clothing/shoes/laceup, - /obj/item/clothing/shoes/laceup/brown, - /obj/item/clothing/shoes/marine/civilian, - /obj/item/clothing/shoes/marine/civilian/brown, - ) - -/obj/effect/essentials_set/random/clf_armor - spawned_gear_list = list( - /obj/item/clothing/suit/armor/vest, - /obj/item/clothing/suit/armor/bulletproof, - /obj/item/clothing/suit/storage/militia/brace, - /obj/item/clothing/suit/storage/militia, - /obj/item/clothing/suit/storage/militia/partial, - /obj/item/clothing/suit/storage/militia/vest, - ) - -/obj/effect/essentials_set/random/clf_gloves - spawned_gear_list = list( - /obj/item/clothing/gloves/black, - /obj/item/clothing/gloves/botanic_leather, - /obj/item/clothing/gloves/combat, - /obj/item/clothing/gloves/swat, - ) - -/obj/effect/essentials_set/random/clf_head - spawned_gear_list = list( - /obj/item/clothing/head/militia, - /obj/item/clothing/head/militia/bucket, - /obj/item/clothing/head/helmet/skullcap, - /obj/item/clothing/head/hardhat, - /obj/item/clothing/head/helmet, - /obj/item/clothing/head/bandana, - /obj/item/clothing/head/headband/red, - /obj/item/clothing/head/headband/rambo, - /obj/item/clothing/head/headband/rebel, - /obj/item/clothing/head/helmet/swat, - ) - -/obj/effect/essentials_set/random/clf_belt - spawned_gear_list = list( - /obj/item/storage/belt/marine, - /obj/item/storage/belt/marine, - /obj/item/storage/belt/marine, - /obj/item/storage/belt/marine, - /obj/item/storage/belt/marine, - /obj/item/storage/belt/gun/flaregun/full, - /obj/item/storage/belt/gun/flaregun/full, - /obj/item/storage/backpack/general_belt, - /obj/item/storage/backpack/general_belt, - /obj/item/storage/backpack/general_belt, - /obj/item/storage/belt/knifepouch, - /obj/item/storage/large_holster/katana/full, - /obj/item/storage/large_holster/machete/full, - ) diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index e48ed05d41..1eb2d2011a 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -85,7 +85,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("Experimental Tool Vendor Token", 0, /obj/item/coin/marine/synth, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("RADIO (TAKE ALL)", 0, null, null, null), - list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("UNIFORM (CHOOSE 1)", 0, null, null, null), list("Uniform, Standard Synth", 0, /obj/item/clothing/under/boiler/darkblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), @@ -167,93 +167,45 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("USCM UNIFORMS", 0, null, null, null), - list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/medical/blue, null, VENDOR_ITEM_REGULAR), - list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/medical, null, VENDOR_ITEM_REGULAR), - list("Medical Scrubs, Green", 12, /obj/item/clothing/under/medical/green, null, VENDOR_ITEM_REGULAR), - list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/medical/purple, null, VENDOR_ITEM_REGULAR), - list("Medical Scrubs, White", 12, /obj/item/clothing/under/medical, null, VENDOR_ITEM_REGULAR), + list("Utility Boilersuit, Dark Blue", 12, /obj/item/clothing/under/boiler/darkblue, null, VENDOR_ITEM_REGULAR), + list("Utility Boilersuit, Light Blue", 12, /obj/item/clothing/under/boiler/lightblue, null, VENDOR_ITEM_REGULAR), + list("USCM Battle Dress Uniform", 12, /obj/item/clothing/under/marine, null, VENDOR_ITEM_REGULAR), + list("USCM Operations Uniform", 12, /obj/item/clothing/under/marine, null, VENDOR_ITEM_REGULAR), list("USCM Service Uniform", 12, /obj/item/clothing/under/marine/service, null, VENDOR_ITEM_REGULAR), list("GLASSES", 0, null, null, null), list("HealthMate HUD", 12, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_REGULAR), - list("Marine RPG Glasses", 12, /obj/item/clothing/glasses/regular, null, VENDOR_ITEM_REGULAR), - list("Optical Meson Scanner", 12, /obj/item/clothing/glasses/meson, null, VENDOR_ITEM_REGULAR), - list("PatrolMate HUD", 12, /obj/item/clothing/glasses/hud/security, null, VENDOR_ITEM_REGULAR), - list("Sunglasses", 12, /obj/item/clothing/glasses/sunglasses, null, VENDOR_ITEM_REGULAR), list("Welding Goggles", 12, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("SHOES", 0, null, null, null), - list("Shoes, Black", 12, /obj/item/clothing/shoes/black, null, VENDOR_ITEM_REGULAR), - list("Shoes, Blue", 12, /obj/item/clothing/shoes/blue, null, VENDOR_ITEM_REGULAR), - list("Shoes, Brown", 12, /obj/item/clothing/shoes/brown, null, VENDOR_ITEM_REGULAR), - list("Shoes, Green", 12, /obj/item/clothing/shoes/green, null, VENDOR_ITEM_REGULAR), - list("Shoes, Purple", 12, /obj/item/clothing/shoes/purple, null, VENDOR_ITEM_REGULAR), list("Shoes, Red", 12, /obj/item/clothing/shoes/red, null, VENDOR_ITEM_REGULAR), list("Shoes, White", 12, /obj/item/clothing/shoes/white, null, VENDOR_ITEM_REGULAR), - list("Shoes, Yellow", 12, /obj/item/clothing/shoes/yellow, null, VENDOR_ITEM_REGULAR), list("Dress Shoes", 24, /obj/item/clothing/shoes/laceup, null, VENDOR_ITEM_REGULAR), list("HEADWEAR", 0, null, null, null), - list("Beanie", 12, /obj/item/clothing/head/beanie, null, VENDOR_ITEM_REGULAR), - list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/blue, null, VENDOR_ITEM_REGULAR), - list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/purple, null, VENDOR_ITEM_REGULAR), - list("Surgical Cap, Green", 12, /obj/item/clothing/head/surgery/green, null, VENDOR_ITEM_REGULAR), - list("Ushanka", 12, /obj/item/clothing/head/ushanka, null, VENDOR_ITEM_REGULAR), - list("Cap", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR), - list("QM Cap", 12, /obj/item/clothing/head/cmcap/req/ro, null, VENDOR_ITEM_REGULAR), - list("Req Cap", 12, /obj/item/clothing/head/cmcap/req, null, VENDOR_ITEM_REGULAR), - list("Bio Hood", 12, /obj/item/clothing/head/bio_hood/synth, null, VENDOR_ITEM_REGULAR), + list("Patrol Cap, Green", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR), + list("Patrol Cap, Command", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR), + list("Patrol Cap, Khaki", 12, /obj/item/clothing/head/cmcap/req, null, VENDOR_ITEM_REGULAR), list("HELMET", 0, null, null, null), list("Marine Helmet (Mission-Specific Camo)", 12, /obj/item/clothing/head/helmet/marine, null, VENDOR_ITEM_REGULAR), - list("Marine Helmet (Grey)", 12, /obj/item/clothing/head/helmet/marine/grey, null, VENDOR_ITEM_REGULAR), - list("Marine Helmet (Jungle)", 12, /obj/item/clothing/head/helmet/marine/jungle, null, VENDOR_ITEM_REGULAR), - list("Marine Helmet (Snow)", 12, /obj/item/clothing/head/helmet/marine/snow, null, VENDOR_ITEM_REGULAR), - list("Marine Helmet (Desert)", 12, /obj/item/clothing/head/helmet/marine/desert, null, VENDOR_ITEM_REGULAR), - list("Technician Helmet", 12, /obj/item/clothing/head/helmet/marine/tech, null, VENDOR_ITEM_REGULAR), - list("Corpsman Helmet", 12, /obj/item/clothing/head/helmet/marine/medic, null, VENDOR_ITEM_REGULAR), - list("Attachable Helmet Shield", 12, /obj/item/prop/helmetgarb/riot_shield, null, VENDOR_ITEM_REGULAR), list("SUIT", 0, null, null, null), list("External Webbing", 12, /obj/item/clothing/suit/storage/webbing, null, VENDOR_ITEM_REGULAR), list("Utility Vest", 12, /obj/item/clothing/suit/storage/webbing/utility_vest, null, VENDOR_ITEM_REGULAR), - list("Hazard Vest(Orange)", 12, /obj/item/clothing/suit/storage/hazardvest, null, VENDOR_ITEM_REGULAR), - list("Hazard Vest(Blue)", 12, /obj/item/clothing/suit/storage/hazardvest/blue, null, VENDOR_ITEM_REGULAR), - list("Hazard Vest(Yellow)", 12, /obj/item/clothing/suit/storage/hazardvest/yellow, null, VENDOR_ITEM_REGULAR), - list("Hazard Vest(Black)", 12, /obj/item/clothing/suit/storage/hazardvest/black, null, VENDOR_ITEM_REGULAR), - list("USCM Service Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/service, null, VENDOR_ITEM_REGULAR), list("Windbreaker, Brown", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown, null, VENDOR_ITEM_REGULAR), list("Windbreaker, Grey", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_gray, null, VENDOR_ITEM_REGULAR), list("Windbreaker, Green", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_green, null, VENDOR_ITEM_REGULAR), - list("Windbreaker, First Responder", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_fr, null, VENDOR_ITEM_REGULAR), - list("Windbreaker, Exploration", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant, null, VENDOR_ITEM_REGULAR), - list("Labcoat", 12, /obj/item/clothing/suit/storage/labcoat, null, VENDOR_ITEM_REGULAR), - list("Quartermaster Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR), - list("Bio Suit", 12, /obj/item/clothing/suit/storage/synthbio, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Mission-Specific Camo)", 12, /obj/item/clothing/accessory/poncho, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Green)", 12, /obj/item/clothing/accessory/poncho/green, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Brown)", 12, /obj/item/clothing/accessory/poncho/brown, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Black)", 12, /obj/item/clothing/accessory/poncho/black, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Blue)", 12, /obj/item/clothing/accessory/poncho/blue, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Purple)", 12, /obj/item/clothing/accessory/poncho/purple, null, VENDOR_ITEM_REGULAR), + list("BACKPACK", 0, null, null, null), - list("Backpack, Industrial", 12, /obj/item/storage/backpack/industrial, null, VENDOR_ITEM_REGULAR), - list("Backpack, USCM Medical", 12, /obj/item/storage/backpack/marine/medic, null, VENDOR_ITEM_REGULAR), list("Chestrig, Technician", 12, /obj/item/storage/backpack/marine/satchel/tech, null, VENDOR_ITEM_REGULAR), list("Satchel, USCM", 12, /obj/item/storage/backpack/marine/satchel, null, VENDOR_ITEM_REGULAR), - list("Satchel, Leather", 12, /obj/item/storage/backpack/satchel, null, VENDOR_ITEM_REGULAR), list("USCM RTO Pack", 12, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), list("USCM Welderpack", 12, /obj/item/storage/backpack/marine/engineerpack, null, VENDOR_ITEM_REGULAR), list("USCM Weldersatchel", 12, /obj/item/storage/backpack/marine/engineerpack/satchel, null, VENDOR_ITEM_REGULAR), list("USCM Welder Chestrig", 12, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, null, VENDOR_ITEM_REGULAR), - - list("OTHER", 0, null, null, null), - list("Red Armband", 6, /obj/item/clothing/accessory/armband, null, VENDOR_ITEM_REGULAR), - list("Yellow Armband", 6, /obj/item/clothing/accessory/armband/engine, null, VENDOR_ITEM_REGULAR), - list("Green Armband", 6, /obj/item/clothing/accessory/armband/medgreen, null, VENDOR_ITEM_REGULAR), - )) /obj/structure/machinery/cm_vending/clothing/synth/snowflake diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 472071f833..f236f89bb1 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -771,19 +771,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( flags_item = MOB_LOCK_ON_EQUIP specialty = "M45 ghillie" -/obj/item/clothing/head/helmet/marine/CO - name = "\improper M10 pattern commanding officer helmet" - desc = "A special M10 Pattern Helmet worn by Commanding Officers of the USCM. It reads on the label, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'." - icon_state = "co_officer" - item_state = "co_officer" - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_HIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - specialty = "M10 pattern captain" - flags_atom = NO_SNOW_TYPE - built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security) - /obj/item/clothing/head/helmet/marine/MP name = "\improper M10 pattern MP helmet" desc = "A special variant of the M10 Pattern Helmet worn by the Military Police of the USCM. Whether you're facing a crime syndicate or a mutiny, this bucket will keep your brains intact." @@ -1239,17 +1226,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( cell_explosion(loc, 40, 18, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data) qdel(src) -/obj/item/clothing/head/helmet/marine/reporter - name = "press helmet" - desc = "A helmet designed to make it clear that the wearer is safety aware and not looking for a fight." - icon = 'icons/mob/humans/onmob/contained/war_correspondent.dmi' - icon_state = "wc_helm" - item_state = "wc_helm" - contained_sprite = TRUE - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - - built_in_visors = list() - /obj/item/clothing/head/helmet/marine/cbrn_hood name = "\improper M3 MOPP mask" desc = "The M3 MOPP mask includes a full covering cowl that securely attaches to the MOPP suit. The mask filters out harmful particles in the air to allow the wearer to breathe safely in the field. Depending on the hostility of the contaminated area the mask’s filter will last an average of 12 hours or less." diff --git a/code/modules/clothing/suits/civilian_suit.dm b/code/modules/clothing/suits/civilian_suit.dm index b64bd068ff..b053076da5 100644 --- a/code/modules/clothing/suits/civilian_suit.dm +++ b/code/modules/clothing/suits/civilian_suit.dm @@ -391,9 +391,9 @@ desc = "A brown windbreaker." icon_state = "windbreaker_brown" -/obj/item/clothing/suit/storage/windbreaker/gray - desc = "A gray windbreaker." - icon_state = "windbreaker_gray" +/obj/item/clothing/suit/storage/windbreaker/blue + desc = "A blue windbreaker." + icon_state = "windbreaker_blue" /obj/item/clothing/suit/storage/windbreaker/green desc = "A green windbreaker." diff --git a/code/modules/clothing/suits/clf_suit.dm b/code/modules/clothing/suits/clf_suit.dm index ef87918d4b..2fffb7a8c3 100644 --- a/code/modules/clothing/suits/clf_suit.dm +++ b/code/modules/clothing/suits/clf_suit.dm @@ -83,8 +83,6 @@ armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH armor_energy = CLOTHING_ARMOR_MEDIUMLOW storage_slots = 2 - uniform_restricted = list(/obj/item/clothing/under/marine/opfor/freelancer) - //this one is for CLF /obj/item/clothing/suit/storage/militia name = "colonial militia hauberk" diff --git a/code/modules/clothing/suits/gimmick_suit.dm b/code/modules/clothing/suits/gimmick_suit.dm index 531a91e03c..a966ca8de4 100644 --- a/code/modules/clothing/suits/gimmick_suit.dm +++ b/code/modules/clothing/suits/gimmick_suit.dm @@ -8,7 +8,6 @@ armor_rad = CLOTHING_ARMOR_MEDIUM storage_slots = 2 slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - uniform_restricted = list(/obj/item/clothing/under/marine/opfor/bear) /obj/item/clothing/suit/storage/marine/veteran/dutch name = "\improper D2 armored vest" @@ -23,7 +22,6 @@ storage_slots = 2 light_range = 7 slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - uniform_restricted = list(/obj/item/clothing/under/marine/opfor/dutch) /obj/item/clothing/suit/armor/gimmick/dutch name = "armored jacket" @@ -64,7 +62,6 @@ slowdown = SLOWDOWN_ARMOR_LIGHT storage_slots = 2 movement_compensation = SLOWDOWN_ARMOR_LIGHT - uniform_restricted = list(/obj/item/clothing/under/marine/opfor/van_bandolier) allowed = list( /obj/item/weapon/gun, /obj/item/tank/emergency_oxygen, diff --git a/code/modules/clothing/suits/upp_suit.dm b/code/modules/clothing/suits/upp_suit.dm index f392ff15ce..bc1db79ad6 100644 --- a/code/modules/clothing/suits/upp_suit.dm +++ b/code/modules/clothing/suits/upp_suit.dm @@ -31,7 +31,6 @@ armor_rad = CLOTHING_ARMOR_MEDIUMLOW armor_internaldamage = CLOTHING_ARMOR_HIGH storage_slots = 3 - uniform_restricted = list(/obj/item/clothing/under/marine/opfor/UPP, /obj/item/clothing/under/marine/opfor/UPP/medic, /obj/item/clothing/under/marine/opfor/UPP/engi) /obj/item/clothing/suit/storage/marine/faction/UPP/support name = "\improper UL6 personal armor" @@ -156,7 +155,6 @@ armor_bio = CLOTHING_ARMOR_MEDIUM armor_rad = CLOTHING_ARMOR_MEDIUMLOW armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS - uniform_restricted = list(/obj/item/clothing/under/marine/opfor/UPP, /obj/item/clothing/under/marine/opfor/UPP/medic, /obj/item/clothing/under/marine/opfor/UPP/engi) allowed = list( /obj/item/tank/emergency_oxygen, /obj/item/device/flashlight, diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index bcf573fa34..30d9b95ad5 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -17,7 +17,7 @@ armor_bio = CLOTHING_ARMOR_NONE armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_LOW - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE|UNIFORM_SLEEVE_CUTTABLE contained_sprite = TRUE ///Makes it so that we can see the right name in the vendor. var/specialty = "USCM" @@ -76,14 +76,11 @@ icon_state = "command_jumpsuit" item_state = "command_jumpsuit" worn_state = "command_jumpsuit" - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE flags_atom = NO_SNOW_TYPE specialty = "marine operations" /obj/item/clothing/under/marine/marsoc - name = "\improper USCM battle dress uniform" - desc = "It's a standard-issue Marine Corps battle dress uniform featuring venlar armor inserts at critical areas to protect from blades and ballistics." - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + desc = "It's a standard-issue Marine Corps battle dress uniform featuring venlar armor inserts at critical areas to protect from blades and ballistics. This one is issued to Marine Raiders." icon_state = "marine_raider" worn_state = "marine_raider" specialty = "MARSOC uniform" @@ -109,7 +106,8 @@ /obj/item/clothing/under/marine/blues name = "\improper USCM enlisted dress blues" - desc = "The undershirt and trousers of the legendary Marine dress blues, virtually unchanged since the 19th century. This unadorned variant is for enlisted personnel, E-1 thru E-3." + desc = "It's a standard-issue Marine Corps dress blues uniform offering no defensive qualities. This variant is worn by enlisted personnel, E-1 to E-3." + desc = "The undershirt and trousers of the legendary Marine dress blues, virtually unchanged since the 19th century." icon_state = "marine_blues" item_state = "marine_blues" worn_state = "marine_blues" @@ -126,7 +124,7 @@ /obj/item/clothing/under/marine/blues/nco name = "\improper USCM senior dress blues uniform" - desc = "The undershirt and trousers of the legendary Marine dress blues, virtually unchanged since the 19th century. This variant features the iconic Blood Stripe, worn by NCOs and officers." + desc = "It's a standard-issue Marine Corps dress blues uniform offering no defensive qualities. This variant is worn by NCOs and officers." icon_state = "marine_officer_blues" item_state = "marine_officer_blues" worn_state = "marine_officer_blues" @@ -154,7 +152,7 @@ /obj/item/clothing/under/marine/opfor/UPP/mp name = "\improper UPP Military Police fatigues" - desc = "A set of Military Police UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm." + desc = "It's a set of standard-issue Naval Infantry fatigues featuring venlar armor inserts at critical areas to protect from blades and ballistics." icon_state = "upp_uniform_mp" worn_state = "upp_uniform_mp" flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE @@ -230,15 +228,6 @@ ////// Civilians ///////// -/obj/item/clothing/under/marine/reporter - name = "combat correspondent uniform" - desc = "A relaxed and robust uniform fit for any potential reporting needs." - icon = 'icons/mob/humans/onmob/contained/war_correspondent.dmi' - icon_state = "wc_uniform" - worn_state = "wc_uniform" - contained_sprite = TRUE - flags_atom = NO_NAME_OVERRIDE - /obj/item/clothing/under/synthetic/joe name = "\improper Working Joe Uniform" desc = "A cheap uniform made for Synthetic labor. Tomorrow, Together." @@ -276,7 +265,7 @@ worn_state = "rmc_uniform" flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE contained_sprite = TRUE - icon = 'icons/mob/humans/onmob/contained/royal_marines_commando.dmi' + icon = 'icons/mob/humans/onmob/uniform-layer/uniform_commando.dmi' /obj/item/clothing/under/marine/opfor/royal_marine/tl icon_state = "rmc_uniform_teaml" diff --git a/code/modules/clothing/under/weyland_uniform.dm b/code/modules/clothing/under/weyland_uniform.dm index 640096bc8c..de59044186 100644 --- a/code/modules/clothing/under/weyland_uniform.dm +++ b/code/modules/clothing/under/weyland_uniform.dm @@ -21,19 +21,3 @@ icon_state = "commando_jumpsuit" worn_state = "commando_jumpsuit" -/obj/item/clothing/under/marine/opfor/pmc/corporate - name = "\improper WY corporate security uniform" - desc = "An armored uniform worn by Weyland-Yutani corporate security members. This variant is commonly worn by what are known as 'goons'." - icon = 'icons/mob/humans/onmob/contained/wy_goons.dmi' - icon_state = "uniform" - item_state = "uniform" - worn_state = "uniform" - contained_sprite = TRUE - item_state_slots = null - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE - -/obj/item/clothing/under/marine/opfor/pmc/corporate/lead - desc = "An armored uniform worn by Weyland-Yutani corporate security members. This variant is commonly worn by the lead of the 'goonsquad', as they are colloquially known." - icon_state = "lead_uniform" - item_state = "lead_uniform" - worn_state = "lead_uniform" diff --git a/code/modules/cm_marines/Donator_Kits.dm b/code/modules/cm_marines/Donator_Kits.dm new file mode 100644 index 0000000000..01acf638c2 --- /dev/null +++ b/code/modules/cm_marines/Donator_Kits.dm @@ -0,0 +1,588 @@ +/obj/item/storage/box/donator_kit + name = "donated box" + desc = "A cardboard box stamped with a dollar sign and filled with trinkets. Appears to have been donated by a wealthy sponsor." + icon_state = "donator_kit" + item_state = "giftbag" + var/list/donor_gear = list() + var/donor_key = "GENERIC" //Key the kit is assigned to. If GENERIC, not tied to particular donor. + var/kit_variant + max_w_class = SIZE_TINY + +/obj/item/storage/box/donator_kit/New() + if(kit_variant) + name = "[name] ([kit_variant])" + ..() + +/obj/item/storage/box/donator_kit/fill_preset_inventory() + for(var/donor_item in donor_gear) + new donor_item(src) + +/obj/item/storage/box/donator_kit/open(mob/user) + if((donor_key != "GENERIC") && (donor_key != user.ckey)) + to_chat(user, SPAN_BOLDWARNING("You cannot open a donator kit you do not own!")) + return FALSE + ..() + +/obj/item/storage/box/donator_kit/verb/destroy_kit() + set name = "Destroy Kit" + set category = "Object" + set src in oview(1) + + var/mob/user = usr + + if((donor_key != "GENERIC") && (donor_key != user.ckey)) + to_chat(user, SPAN_BOLDWARNING("You cannot destroy a donator kit you do not own!")) + return FALSE + + log_admin("[key_name(user)] deleted a donator kit.") + qdel(src) + +/obj/item/storage/box/donator_kit/generic_omega //Generic set given to various donors + kit_variant = "Team Omega (G)" + donor_gear = list( + /obj/item/clothing/under/marine/fluff/standard_jumpsuit, + /obj/item/clothing/suit/storage/marine/fluff/standard_armor, + /obj/item/clothing/head/helmet/marine/fluff/standard_helmet, + ) + +//Unless specified in comments as otherwise, subtype of box/donator_kit/ is CKEY of the donator (example: /obj/item/storage/box/donator_kit/sasoperative) +/obj/item/storage/box/donator_kit/adjective + donor_key = "adjective" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/adjective) + +/obj/item/storage/box/donator_kit/alexwarhammer + donor_key = "alexwarhammer" + donor_gear = list(/obj/item/clothing/glasses/fluff/alexwarhammer) + +/obj/item/storage/box/donator_kit/allan1234 + donor_key = "allan1234" + donor_gear = list(/obj/item/clothing/under/marine/fluff/allan1234) + +/obj/item/storage/box/donator_kit/arachnidnexus + donor_key = "arachnidnexus" + donor_gear = list(/obj/item/clothing/under/marine/fluff/arach) + +/obj/item/storage/box/donator_kit/bibblesless + donor_key = "bibblesless" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/bibblesless) + +/obj/item/storage/box/donator_kit/biolock + donor_key = "biolock" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/biolock, + /obj/item/clothing/suit/storage/marine/light/fluff/biolock, + ) + +/obj/item/storage/box/donator_kit/bunny232 + donor_key = "bunny232" + donor_gear = list(/obj/item/clothing/glasses/fluff/eyepatch) + +/obj/item/storage/box/donator_kit/bwoincognito + donor_key = "bwoincognito" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/bwoincognito, + /obj/item/clothing/suit/storage/marine/fluff/bwoincognito, + /obj/item/clothing/under/marine/fluff/bwoincognito, + ) + +/obj/item/storage/box/donator_kit/chris1464 + donor_key = "chris1464" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/chris1464, + /obj/item/clothing/suit/storage/marine/fluff/chris1464, + /obj/item/clothing/under/marine/fluff/chris1464, + ) + +/obj/item/storage/box/donator_kit/commandercookies + donor_key = "commandercookies" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/commandercookies, + /obj/item/clothing/suit/storage/marine/fluff/commandercookies, + ) + +/obj/item/storage/box/donator_kit/commissar //used by both ckeys 'hycinth' and 'technokat' + donor_key = "hycinth" + kit_variant = "Commissar" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/commissar, + /obj/item/clothing/suit/storage/marine/fluff/commissar, + /obj/item/clothing/under/marine/fluff/commissar, + /obj/item/storage/belt/marine/fluff/commissar, + ) + +/obj/item/storage/box/donator_kit/commissar/technokat + donor_key = "technokat" + +/obj/item/storage/box/donator_kit/crazyh206 + donor_key = "crazyh206" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/crazyh206) + +/obj/item/storage/box/donator_kit/devilzhand + donor_key = "devilzhand" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/devilzhand, + /obj/item/clothing/suit/storage/marine/fluff/devilzhand, + ) + +/obj/item/storage/box/donator_kit/dingledangle + donor_key = "dingledangle" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/dingledangle) + +/obj/item/storage/box/donator_kit/dinobubba7 + donor_key = "dinobubba7" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/dino, + /obj/item/clothing/suit/storage/marine/fluff/dino, + ) + +/obj/item/storage/box/donator_kit/docdemo + donor_key = "docdemo" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/goldtrimberet) + +/obj/item/storage/box/donator_kit/dudewithatude + donor_key = "dudewithatude" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/dudewithatude) + +/obj/item/storage/box/donator_kit/eastgermanstasi + donor_key = "eastgermanstasi" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/eastgerman) + +/obj/item/storage/box/donator_kit/edgelord + donor_key = "edgelord" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/edgelord) + +/obj/item/storage/box/donator_kit/eonoc + donor_key = "eonoc" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/eonoc) + +/obj/item/storage/box/donator_kit/fairedan + donor_key = "fairedan" + donor_gear = list( + /obj/item/clothing/suit/storage/marine/fluff/fairedan, + /obj/item/clothing/under/marine/fluff/fairedan, + ) + +/obj/item/storage/box/donator_kit/feodrich + donor_key = "feodrich" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/feodrich, + /obj/item/clothing/shoes/marine/fluff/feodrich, + /obj/item/clothing/suit/storage/marine/fluff/feodrich, + /obj/item/clothing/under/marine/fluff/feodrich, + ) + +/obj/item/storage/box/donator_kit/fernkiller + donor_key = "fernkiller" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/fernkiller) + +/obj/item/storage/box/donator_kit/feweh + donor_key = "feweh" + donor_gear = list( + /obj/item/clothing/mask/fluff/feweh, + /obj/item/clothing/suit/storage/marine/fluff/feweh, + /obj/item/clothing/under/marine/fluff/feweh, + ) + +/obj/item/storage/box/donator_kit/fickmacher_selena //ckey fickmacher has two sets + donor_key = "fickmacher" + kit_variant = "Selena" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/fickmacher, + /obj/item/clothing/suit/storage/marine/fluff/fickmacher, + /obj/item/clothing/under/marine/fluff/fickmacher, + ) + +/obj/item/storage/box/donator_kit/fickmacher_hart + donor_key = "fickmacher" + kit_variant = "Hart" + donor_gear = list( + /obj/item/clothing/mask/fluff/fickmacher2, + /obj/item/clothing/suit/storage/marine/fluff/fickmacher2, + /obj/item/clothing/under/marine/fluff/fickmacher2, + ) + +/obj/item/storage/box/donator_kit/fridrich + donor_key = "fridrich" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/fridrich) + +/obj/item/storage/box/donator_kit/ghostdex + donor_key = "ghostdex" + donor_gear = list( + /obj/item/clothing/mask/cigarette/fluff/ghostdex, + /obj/item/tool/lighter/zippo/fluff/ghostdex, + ) + +/obj/item/storage/box/donator_kit/graciegrace0 + donor_key = "graciegrace0" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/medicae_helmet, + /obj/item/clothing/suit/storage/marine/fluff/medicae_armor, + /obj/item/clothing/under/marine/fluff/medicae_jumpsuit, + ) + +/obj/item/storage/box/donator_kit/gromoi + donor_key = "gromoi" + donor_gear = list( + /obj/item/clothing/suit/storage/marine/fluff/gromi, + /obj/item/clothing/under/marine/fluff/gromi, + ) + +/obj/item/storage/box/donator_kit/haveatya + donor_key = "haveatya" + donor_gear = list( + /obj/item/clothing/glasses/fluff/haveatya, + /obj/item/clothing/head/helmet/marine/fluff/haveatya, + /obj/item/clothing/under/marine/fluff/turtleneck, //generic item + ) + +/obj/item/storage/box/donator_kit/jackmcintyre + donor_key = "jackmcintyre" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/jackmcintyre, + /obj/item/clothing/suit/storage/marine/fluff/jackmcintyre, + /obj/item/clothing/under/marine/fluff/jackmcintyre, + /obj/item/clothing/under/marine/fluff/jackmcintyre_alt, + ) + +/obj/item/storage/box/donator_kit/jdobbin49 + donor_key = "jdobbin49" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/jdobbin49) + +/obj/item/storage/box/donator_kit/jedijasun + donor_key = "jedijasun" + donor_gear = list(/obj/item/clothing/gloves/marine/fluff/jedijas) + +/obj/item/storage/box/donator_kit/johnkilla56 + donor_key = "johnkilla56" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/john56, + /obj/item/clothing/mask/fluff/john56, + /obj/item/clothing/suit/storage/marine/fluff/john56, + /obj/item/clothing/under/marine/fluff/john56, + ) + +/obj/item/storage/box/donator_kit/juninho77 + donor_key = "juninho77" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/juniho, + /obj/item/clothing/suit/storage/marine/fluff/juninho, + /obj/item/clothing/under/marine/fluff/juninho, + ) + +/obj/item/storage/box/donator_kit/kilinger + donor_key = "kilinger" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/goldshieldberet) + +/obj/item/storage/box/donator_kit/kyrac + donor_key = "kyrac" + donor_gear = list( + /obj/item/clothing/under/marine/fluff/turtleneck, + /obj/item/clothing/glasses/fluff/eyepatch, + ) + +/obj/item/storage/box/donator_kit/laser243 + donor_key = "laser243" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/laser243, + /obj/item/clothing/suit/storage/marine/fluff/laser243, + ) + +/obj/item/storage/box/donator_kit/leondark16 + donor_key = "leondark16" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/leondark) + +/obj/item/storage/box/donator_kit/lestatanderson + donor_key = "lestatanderson" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/cia) + +/obj/item/storage/box/donator_kit/limodish + donor_key = "limodish" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/limo, + /obj/item/clothing/mask/fluff/limo, + /obj/item/clothing/suit/storage/marine/fluff/limo, + /obj/item/clothing/under/marine/fluff/turtleneck, //generic item + ) + +/obj/item/storage/box/donator_kit/lostmixup + donor_key = "lostmixup" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/lostmixup, + /obj/item/clothing/mask/fluff/lostmixup, + /obj/item/clothing/suit/storage/marine/fluff/lostmixup, + ) + +/obj/item/storage/box/donator_kit/markvalentine + donor_key = "markvalentine" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/valentine, + /obj/item/clothing/suit/storage/marine/fluff/valentine, + /obj/item/clothing/under/marine/fluff/valentine, + ) + +/obj/item/storage/box/donator_kit/mitii + donor_key = "mitii" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/mitii, + /obj/item/clothing/suit/storage/marine/fluff/mitii, + /obj/item/storage/backpack/marine/fluff/mitii, + ) + +/obj/item/storage/box/donator_kit/mrbark45 + donor_key = "mrbark45" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/bark) + +/obj/item/storage/box/donator_kit/nickiskool + donor_key = "nickiskool" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/nickiskool, + /obj/item/clothing/suit/storage/marine/fluff/nickiskool, + /obj/item/clothing/under/marine/fluff/nickiskool, + ) + +/obj/item/storage/box/donator_kit/ningajai + donor_key = "ningajai" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/ningajai) + +/obj/item/storage/box/donator_kit/obeystylez + donor_key = "obeystylez" + donor_gear = list( + /obj/item/clothing/gloves/black/obey, + /obj/item/clothing/mask/fluff/balaclava, //generic item + /obj/item/clothing/suit/storage/marine/fluff/obey, + /obj/item/clothing/under/marine/fluff/turtleneck, //generic item + ) + +/obj/item/storage/box/donator_kit/officialjake + donor_key = "officialjake" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/officialjake) + +/obj/item/storage/box/donator_kit/oneonethreeeight + donor_key = "oneonethreeeight" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/oneonethreeeight, + /obj/item/clothing/suit/storage/marine/fluff/oneonethreeeight, + /obj/item/clothing/under/marine/fluff/oneonethreeeight, + ) + +/obj/item/storage/box/donator_kit/paradox1i7 + donor_key = "paradox1i7" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/paradox, + /obj/item/clothing/suit/storage/marine/fluff/paradox, + /obj/item/clothing/under/marine/fluff/paradox, + ) + +/obj/item/storage/box/donator_kit/poops_buttly + donor_key = "poops_buttly" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/kaila, + /obj/item/clothing/suit/storage/marine/fluff/kaila, + ) + +/obj/item/storage/box/donator_kit/radicalscorpion + donor_key = "radicalscorpion" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/radical, + /obj/item/clothing/mask/fluff/balaclava, //generic item + /obj/item/clothing/suit/storage/marine/fluff/radical, + /obj/item/clothing/under/marine/fluff/radical, + ) + +/obj/item/storage/box/donator_kit/robin63 + donor_key = "robin63" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/robin) + +/obj/item/storage/box/donator_kit/rogue1131 + donor_key = "rogue1131" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/titus, + /obj/item/clothing/suit/storage/marine/fluff/titus, + ) + +/obj/item/storage/box/donator_kit/sadokist + donor_key = "sadokist" + donor_gear = list( + /obj/item/clothing/glasses/fluff/sadokist, + /obj/item/clothing/head/helmet/marine/fluff/sadokist, + /obj/item/clothing/suit/storage/marine/fluff/sadokist, + /obj/item/storage/backpack/marine/fluff/sadokist, + ) + +/obj/item/storage/box/donator_kit/sailordave + donor_key = "sailordave" + donor_gear = list(/obj/item/clothing/under/marine/fluff/sailordave) + +/obj/item/storage/box/donator_kit/sasoperative_elite //sasoperative has several sets + donor_key = "sasoperative" + kit_variant = "Elite" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/sas_elite, + /obj/item/clothing/mask/fluff/sas_elite, + /obj/item/clothing/suit/storage/marine/fluff/sas_elite, + /obj/item/clothing/under/marine/fluff/sas_elite, + ) + +/obj/item/storage/box/donator_kit/sasoperative_juggernaut + donor_key = "sasoperative" + kit_variant = "Juggernaut" + donor_gear = list( + /obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut, + /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut, + /obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut, + ) + +/obj/item/storage/box/donator_kit/sasoperative_legion + donor_key = "sasoperative" + kit_variant = "Legion" + donor_gear = list( + /obj/item/clothing/suit/storage/marine/fluff/sas_legion, + /obj/item/clothing/under/marine/fluff/sas_legion, + /obj/item/clothing/mask/fluff/sas_legion, + ) + +/obj/item/storage/box/donator_kit/seloc_aferah + donor_key = "seloc_aferah" + donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/deejay) + +/obj/item/storage/box/donator_kit/starscream123 + donor_key = "starscream123" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/starscream, + /obj/item/clothing/mask/fluff/starscream, + /obj/item/clothing/suit/storage/marine/fluff/starscream, + /obj/item/clothing/under/marine/fluff/starscream, + ) + +/obj/item/storage/box/donator_kit/steelpoint + donor_key = "steelpoint" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/steelpoint, + /obj/item/clothing/shoes/marine/fluff/steelpoint, + /obj/item/clothing/suit/storage/marine/fluff/steelpoint, + /obj/item/clothing/under/marine/fluff/steelpoint, + ) + +/obj/item/storage/box/donator_kit/stobarico + donor_key = "stobarico" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/stobarico) + +/obj/item/storage/box/donator_kit/theflagbearer + donor_key = "theflagbearer" + donor_gear = list(/obj/item/clothing/under/marine/fluff/leeeverett) + +/obj/item/storage/box/donator_kit/theultimatechimera + donor_key = "theultimatechimera" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/chimera, + /obj/item/clothing/suit/storage/marine/fluff/chimera, + ) + +/obj/item/storage/box/donator_kit/tophatpenguin_wooki //ckey tophatpenguin has two sets + donor_key = "tophatpenguin" + kit_variant = "Wooki" + donor_gear = list( + /obj/item/clothing/suit/storage/marine/fluff/penguin, + /obj/item/clothing/under/marine/fluff/wooki, + /obj/item/clothing/head/helmet/marine/fluff/penguin, + ) + +/obj/item/storage/box/donator_kit/tophatpenguin_santa + donor_key = "tophatpenguin" + kit_variant = "Santa" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/santahat, + /obj/item/clothing/suit/storage/marine/fluff/santa, + ) + +/obj/item/storage/box/donator_kit/totalanarchy + donor_key = "totalanarchy" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/totalanarchy, + /obj/item/clothing/mask/fluff/totalanarchy, + /obj/item/clothing/suit/storage/marine/fluff/totalanarchy, + /obj/item/clothing/under/marine/fluff/totalanarchy, + ) + +/obj/item/storage/box/donator_kit/tranquill + donor_key = "tranquill" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/tranquill) + +/obj/item/storage/box/donator_kit/trblackdragon + donor_key = "trblackdragon" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/trblackdragon, + /obj/item/clothing/suit/storage/marine/fluff/trblackdragon, + ) + +/obj/item/storage/box/donator_kit/tristan63 + donor_key = "tristan63" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/tristan, + /obj/item/clothing/suit/storage/marine/fluff/tristan, + /obj/item/clothing/under/marine/fluff/tristan, + ) + +/obj/item/storage/box/donator_kit/tyran68 + donor_key = "tyran68" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/tyran) + +/obj/item/storage/box/donator_kit/shotgunbill + donor_key = "shotgunbill" + donor_gear = list(/obj/item/clothing/head/collectable/petehat) + +/obj/item/storage/box/donator_kit/vintagepalmer + donor_key = "vintagepalmer" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/vintage, + /obj/item/clothing/shoes/marine/fluff/vintage, + /obj/item/clothing/suit/storage/marine/fluff/vintage, + /obj/item/clothing/under/marine/fluff/vintage, + ) + +/obj/item/storage/box/donator_kit/whiteblood17 + donor_key = "whiteblood17" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/whiteblood17, + /obj/item/clothing/under/marine/fluff/whiteblood17, + ) + +/obj/item/storage/box/donator_kit/wrightthewrong + donor_key = "wrightthewrong" + donor_gear = list( + /obj/item/clothing/glasses/fluff/wright, + /obj/item/clothing/suit/storage/marine/fluff/wright, + /obj/item/clothing/under/marine/fluff/turtleneck, //generic item + ) + +/obj/item/storage/box/donator_kit/zegara + donor_key = "zegara" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/zegara) + +/obj/item/storage/box/donator_kit/zynax + donor_key = "zynax" + donor_gear = list( + /obj/item/clothing/mask/fluff/balaclava, //generic item + /obj/item/clothing/suit/storage/marine/fluff/Zynax, + /obj/item/clothing/under/marine/fluff/turtleneck, //generic item + /obj/item/clothing/under/marine/fluff/Zynax, + ) + +/obj/item/storage/box/donator_kit/mileswolfe + donor_key = "mileswolfe" + donor_gear = list(/obj/item/clothing/under/marine/fluff/mileswolfe) + +/obj/item/storage/box/donator_kit/killaninja12 + donor_key = "killaninja12" + donor_gear = list( + /obj/item/clothing/head/helmet/marine/fluff/killaninja12, + /obj/item/clothing/suit/storage/marine/fluff/killaninja12, + ) + +/obj/item/storage/box/donator_kit/noize + donor_key = "noize" + donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/forwardslashn) + +/obj/item/storage/box/donator_kit/deanthelis + donor_key = "deanthelis" + donor_gear = list(/obj/item/clothing/head/beret/marine/techofficer) diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index f3756b05a6..27fc77e2fa 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -38,7 +38,7 @@ /datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/offwhite(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) @@ -183,7 +183,7 @@ // Part-timers /datum/equipment_preset/survivor/hybrisa/weymart - name = "Survivor - Hybrisa - Civilian - Weymart Employee" + name = "Survivor - Colonist - Weymart Employee" assignment = "Hi! My name is:" skills = /datum/skills/civilian flags = EQUIPMENT_PRESET_START_OF_ROUND @@ -207,3 +207,15 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/weymart(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/weymart(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + +// Utility Workers + +/datum/equipment_preset/survivor/hybrisa/sanitation + name = "Prop - Colonist - Sanitation Worker" + assignment = "Material Reprocessing Technician" + +/datum/equipment_preset/survivor/hybrisa/fire_fighter + name = "Prop - Colonist - Firefighter" + assignment = "Fire Protection Specialist" + +// Pizza Galaxy diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index 14753a455c..0fbf5fae9a 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -15,17 +15,12 @@ /datum/equipment_preset/contractor/load_name(mob/living/carbon/human/new_human) - new_human.gender = pick(60;MALE,40;FEMALE) - var/datum/preferences/A = new() + new_human.gender = pick(80;MALE,20;FEMALE) + var/datum/preferences/A = new A.randomize_appearance(new_human) - var/random_name - random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) - new_human.change_real_name(new_human, random_name) - new_human.name = new_human.real_name - new_human.age = rand(22,45) - - var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) - var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) + var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) + var/static/list/colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "BROWN" = list(48, 38, 18),"BLUE" = list(29, 51, 65), "GREEN" = list(40, 61, 39), "STEEL" = list(46, 59, 54)) + var/static/list/hair_colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "AUBURN" = list(77, 48, 36), "BLONDE" = list(95, 76, 44)) var/hair_color = pick(hair_colors) new_human.r_hair = hair_colors[hair_color][1] new_human.g_hair = hair_colors[hair_color][2] @@ -37,17 +32,13 @@ new_human.r_eyes = colors[eye_color][1] new_human.g_eyes = colors[eye_color][2] new_human.b_eyes = colors[eye_color][3] - idtype = /obj/item/card/id/data if(new_human.gender == MALE) - new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) - new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) + new_human.h_style = pick("Undercut", "Partly Shaved", "Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "CIA", "CIA", "Mulder", "Mulder", "Medium Fade", "High Fade", "Coffee House Cut") + new_human.f_style = pick("Shaved", "Shaved", "Shaved", "3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else - new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) + new_human.h_style = pick("Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "CIA", "CIA", "Mulder", "Pixie Cut Left", "Pixie Cut Right", "Bun") new_human.change_real_name(new_human, random_name) - new_human.age = rand(20,45) - new_human.r_hair = rand(15,35) - new_human.g_hair = rand(15,35) - new_human.b_hair = rand(25,45) + new_human.age = rand(20,50) /datum/equipment_preset/contractor/load_id(mob/living/carbon/human/new_human, client/mob_client) if(human_versus_human) @@ -74,7 +65,6 @@ var/choice = rand(1,10) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 09f3aa86db..5425de68be 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -133,8 +133,6 @@ WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe ) - survivor_variant = MEDICAL_SURVIVOR - /datum/equipment_preset/synth/survivor/emt_synth name = "Synthetic - EMT Synth" equipment_to_spawn = list( @@ -171,31 +169,6 @@ WEAR_FEET = /obj/item/clothing/shoes/laceup, ) - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/synth/survivor/wy/protection_synth - name = "Synthetic - Corporate Protection Synth" - idtype = /obj/item/card/id/pmc - role_comm_title = "WY Syn" - equipment_to_spawn = list( - WEAR_HEAD = /obj/item/clothing/head/helmet/marine/veteran/pmc, - WEAR_L_EAR = /obj/item/device/radio/headset/distress/pmc/hvh, - WEAR_BODY = /obj/item/clothing/under/marine/opfor/pmc, - WEAR_ACCESSORY = /obj/item/clothing/accessory/storage/droppouch, - WEAR_IN_ACCESSORY = /obj/item/explosive/grenade/flashbang, - WEAR_IN_ACCESSORY = /obj/item/handcuffs/zip, - WEAR_IN_ACCESSORY = /obj/item/handcuffs/zip, - WEAR_BACK = /obj/item/storage/backpack/lightpack, - WEAR_IN_BACK = /obj/item/device/binoculars, - WEAR_JACKET = /obj/item/clothing/suit/storage/hazardvest/black, - WEAR_IN_JACKET = /obj/item/weapon/telebaton, - WEAR_HANDS = /obj/item/clothing/gloves/marine/veteran/pmc, - WEAR_FEET = /obj/item/clothing/shoes/veteran/pmc/knife, - WEAR_L_HAND = /obj/item/storage/large_holster/machete/full - ) - - survivor_variant = SECURITY_SURVIVOR - /datum/equipment_preset/synth/survivor/wy/corporate_synth name = "Synthetic - Corporate Clerical Synth" idtype = /obj/item/card/id/data @@ -217,7 +190,6 @@ WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe ) - survivor_variant = CORPORATE_SURVIVOR //*****************************************************************************************************/ /datum/equipment_preset/synth/working_joe diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 63b9ee5879..9dbf36b24f 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -732,17 +732,17 @@ //body new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/operations(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) //limbs new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown(new_human), WEAR_HANDS) //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88(new_human), WEAR_IN_R_STORE) - + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_R_STORE) /datum/equipment_preset/uscm/tank/load_status(mob/living/carbon/human/new_human) return @@ -771,34 +771,37 @@ /datum/equipment_preset/uscm/marsoc/load_gear(mob/living/carbon/human/new_human) //back - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_forecon, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/marsoc, WEAR_FACE) //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/sof, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_HELMET) - //uniform - var/obj/item/clothing/under/marine/opfor/marsoc/M = new() + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/sof(new_human), WEAR_HEAD) + //body + var/obj/item/clothing/under/marine/M = new() var/obj/item/clothing/accessory/storage/black_vest/W = new() M.attach_accessory(new_human, W) new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_ACCESSORY) - //jacket - var/obj/item/clothing/suit/storage/marine/sof/armor = new() - new_human.equip_to_slot_or_del(armor, WEAR_JACKET) - for(var/i in 1 to armor.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm40/heap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite/xm40, WEAR_J_STORE) - //waist + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/sof(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/marsoc, WEAR_WAIST) //limbs new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/socmed/full, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE) + //face + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/marsoc, WEAR_FACE) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/sof, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_HELMET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/socmed/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pulse_rifle, WEAR_R_STORE) /datum/equipment_preset/uscm/marsoc/load_rank(mob/living/carbon/human/new_human) if(new_human.client) diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index e213a19fb9..f6199d1d56 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -41,7 +41,6 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest/dcc(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/MP(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE) @@ -96,7 +95,6 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest/dcc(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/MP(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE) diff --git a/colonialmarines.dme b/colonialmarines.dme index 291faaffc4..a79b0dd53f 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1675,7 +1675,6 @@ #include "code\modules\gear_presets\whiteout.dm" #include "code\modules\gear_presets\wy.dm" #include "code\modules\gear_presets\yautja.dm" -#include "code\modules\gear_presets\survivors\misc.dm" #include "code\modules\gear_presets\survivors\survivors.dm" #include "code\modules\gear_presets\survivors\lv_522\forcon_survivors.dm" #include "code\modules\holidays\halloween\decorators.dm" diff --git a/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi b/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi index f8aafafb76..1df2af7b94 100644 Binary files a/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi and b/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi differ diff --git a/icons/mob/humans/onmob/suit-layer/suit_marine.dmi b/icons/mob/humans/onmob/suit-layer/suit_marine.dmi index 5bb2bd6de9..2ef8d8b050 100644 Binary files a/icons/mob/humans/onmob/suit-layer/suit_marine.dmi and b/icons/mob/humans/onmob/suit-layer/suit_marine.dmi differ diff --git a/icons/mob/humans/onmob/uniform-layer/uniform_civilian.dmi b/icons/mob/humans/onmob/uniform-layer/uniform_civilian.dmi index 6ea3b3a9b7..0c92dee626 100644 Binary files a/icons/mob/humans/onmob/uniform-layer/uniform_civilian.dmi and b/icons/mob/humans/onmob/uniform-layer/uniform_civilian.dmi differ diff --git a/strings/first_male.txt b/strings/first_male.txt index 3e69697bce..7f1ad7f994 100644 --- a/strings/first_male.txt +++ b/strings/first_male.txt @@ -2,12 +2,8 @@ Aaron Abel Abraham Adam -Adan -Aden Adrian -Aidan Aiden -A.J. Ajax Alan Albert @@ -16,16 +12,13 @@ Alden Alec Alejandro Alex -Alex Alexander -Alexis Alfred Alfredo Alger Ali Alijah Allen -Allen Alvin Amari Amir @@ -35,7 +28,6 @@ Andre Andres Andrew Andy -Angel Angelo Anthony Antonio @@ -43,18 +35,17 @@ Apple Archie Armando Arnie +Arnold Art Arthur Arturo Asher Ashton -Atax August Austin Avery Axel Ayden -Baldric Bart Bartholomew Beau @@ -64,17 +55,12 @@ Bennett Bert Bill Blake -Blake Bo Braden Bradley Brady -Braiden Brandon Braxton -Brayan -Brayden -Braylon Brendan Brett Brian @@ -85,7 +71,6 @@ Brodie Brody Bronte Bruce -Bruce Bryan Bryant Bryce @@ -152,7 +137,6 @@ Cristopher Crush Cruz Curtis -Cy Dakota Dallas Dalton @@ -672,8 +656,4 @@ York Zachariah Zachary Zack -Zackary -Zane -Zayden -Zeke -Zion +Zane \ No newline at end of file