diff --git a/code/datums/factions/clf.dm b/code/datums/factions/clf.dm index ce53b505b3..5456084b1a 100644 --- a/code/datums/factions/clf.dm +++ b/code/datums/factions/clf.dm @@ -66,7 +66,7 @@ list("S&W .357 Revolver", 15, /obj/item/weapon/gun/revolver/small, null, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", 0, null, null, null), - list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR), list("Beretta 92FS Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/b92fs, null, VENDOR_ITEM_REGULAR), list("KT-42 Magazine (.44)", 5, /obj/item/ammo_magazine/pistol/kt42, null, VENDOR_ITEM_REGULAR), list("Spearhead Speed Loader (.357)", 10, /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR), @@ -134,7 +134,7 @@ list("S&W .357 Revolver", 20, /obj/item/weapon/gun/revolver/small, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), - list("88M4 AP Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("Beretta 92FS Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/b92fs, VENDOR_ITEM_REGULAR), list("KT-42 Magazine (.44)", 40, /obj/item/ammo_magazine/pistol/kt42, VENDOR_ITEM_REGULAR), list("Spearhead Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR), diff --git a/code/datums/factions/pmc.dm b/code/datums/factions/pmc.dm index c5b319a13c..0b48fc63eb 100644 --- a/code/datums/factions/pmc.dm +++ b/code/datums/factions/pmc.dm @@ -47,7 +47,7 @@ list("SIDEARM AMMUNITION", 0, null, null, null), list("VP78 magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), - list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), @@ -87,7 +87,7 @@ list("SIDEARM AMMUNITION", 0, null, null, null), list("VP78 magazine (9mm)", 50, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), - list("88M4 AP Magazine (9mm)", 50, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", 50, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), list("M94 Marking Flare Pack", 30, /obj/item/storage/box/m94, null, VENDOR_ITEM_RECOMMENDED), diff --git a/code/datums/factions/royalmarinescommando.dm b/code/datums/factions/royalmarinescommando.dm index 2fab0348bc..b5605ea61f 100644 --- a/code/datums/factions/royalmarinescommando.dm +++ b/code/datums/factions/royalmarinescommando.dm @@ -44,7 +44,7 @@ list("SIDEARM AMMUNITION", 0, null, null, null), list("VP78 magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), - list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), @@ -83,7 +83,7 @@ list("SIDEARM AMMUNITION", -1, null, null), list("VP78 magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), - list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR), list("UTILITIES", -1, null, null), list("M94 Marking Flare Pack", 3, /obj/item/storage/box/m94, null, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index a57bbfe7d2..445a5c5b9f 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -222,8 +222,8 @@ ) /obj/structure/machinery/vending/security - name = "\improper SecTech" - desc = "A security equipment vendor." + name = "\improper ColMarTech Military Police Vendor" + desc = "A USCM Military Police vendor." product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?" icon_state = "sec" icon_deny = "sec-deny" @@ -231,27 +231,33 @@ products = list( /obj/item/handcuffs = 8, /obj/item/handcuffs/zip = 10, - /obj/item/explosive/grenade/flashbang = 4, /obj/item/weapon/gun/energy/taser = 4, /obj/item/reagent_container/spray/pepper = 4, /obj/item/weapon/baton = 4, /obj/item/device/flashlight = 4, /obj/item/storage/belt/security/MP = 4, /obj/item/device/flash = 5, - /obj/item/reagent_container/food/snacks/donut/normal = 12, /obj/item/storage/box/evidence = 6, - /obj/item/clothing/head/helmet/marine/MP = 6, - /obj/item/clothing/head/beret/marine/mp/mppeaked = 6, - /obj/item/clothing/head/beret/marine/mp/mpcap = 6, + /obj/item/clothing/head/helmet/marine/MP = 2, /obj/item/clothing/under/marine/mp = 2, - /obj/item/storage/belt/security/MP = 6, - /obj/item/clothing/head/beret/marine/mp = 6, - /obj/item/clothing/glasses/sunglasses/sechud = 3, - /obj/item/device/radio/headset = 6, /obj/item/tape/regulation = 5, ) contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/donut_box = 2) +/obj/structure/machinery/vending/security/colony + name = "\improper SecTech Police Vendor" + desc = "A generic police vendor." + req_access = list(ACCESS_CIVILIAN_BRIG) + products = list( + /obj/item/handcuffs = 8, + /obj/item/reagent_container/spray/pepper = 4, + /obj/item/device/flashlight = 4, + /obj/item/storage/belt/security/MP/CMB = 4, + /obj/item/device/flash = 5, + /obj/item/storage/box/evidence = 6, + /obj/item/tape/regulation = 5, + ) + /obj/structure/machinery/vending/sea name = "\improper SeaTech" desc = "An equipment vendor designed to save lives" diff --git a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm index 027c9bec2d..14691dbe27 100644 --- a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm @@ -30,7 +30,7 @@ list("M82F Flare Gun", 4, /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), - list("88M4 AP Magazine (9mm)", 20, /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", 20, /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("M44 Speedloader (.44)", 20, /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", 20, /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine (9mm)", 12, /obj/item/ammo_magazine/pistol/ap, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index d352936b54..55046eaa2b 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -278,7 +278,7 @@ GLOBAL_LIST_INIT(cm_vending_vehicle_crew_apc_spare, list( list("M82F Flare Gun", 2, /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), - list("88M4 AP Magazine (9mm)", 10, /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", 10, /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("M44 Speedloader (.44)", 10, /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", 10, /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine (9mm)", 6, /obj/item/ammo_magazine/pistol/ap, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index aee17649e9..f3c4973c3f 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -224,9 +224,9 @@ list("M39 HV Magazine (10x20mm)", round(scale * 50), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), list("M44 Speed Loader (.44)", round(scale * 40), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), + list("88 Mod 4 Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("ARMOR-PIERCING AMMUNITION", -1, null, null), - list("88 Mod 4 AP Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), list("M4RA AP Magazine (10x24mm)", round(scale * 15.7), /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", round(scale * 11.9), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR), list("M41A MK2 AP Magazine (10x24mm)", round(scale * 10.5), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 1e9a8715a2..7ba67133b5 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -37,7 +37,7 @@ list("M82F Flare Gun", round(scale * 10), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), - list("88M4 AP Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), @@ -440,7 +440,7 @@ list("M82F Flare Gun", round(scale * 1), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), - list("88M4 AP Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), list("VP78 magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), @@ -560,7 +560,7 @@ list("SIDEARM AMMUNITION", -1, null, null), list("M1911 Magazine (.45)", round(scale * 20), /obj/item/ammo_magazine/pistol/m1911, VENDOR_ITEM_REGULAR), - list("88M4 AP Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), list("VP78 magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/wo_vendors.dm b/code/game/machinery/vending/vendor_types/wo_vendors.dm index 557933754f..37e5aa1c27 100644 --- a/code/game/machinery/vending/vendor_types/wo_vendors.dm +++ b/code/game/machinery/vending/vendor_types/wo_vendors.dm @@ -93,7 +93,7 @@ list("M82F Flare Gun", round(scale * 5), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), - list("88M4 AP Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), + list("88M4 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/effects/spawners/faction_spawners.dm b/code/game/objects/effects/spawners/faction_spawners.dm index 2daf6392e5..eb634e383d 100644 --- a/code/game/objects/effects/spawners/faction_spawners.dm +++ b/code/game/objects/effects/spawners/faction_spawners.dm @@ -134,7 +134,7 @@ mags_min = 1 guns = list( /obj/item/weapon/gun/pistol/vp78 = /obj/item/ammo_magazine/pistol/vp78, - /obj/item/weapon/gun/pistol/mod88 = /obj/item/ammo_magazine/pistol/mod88 + /obj/item/weapon/gun/pistol/mod88 = /obj/item/ammo_magazine/pistol/mod88/normalpoint ) /obj/effect/spawner/random/gun/pmc_secondary/lowchance diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 22d6905159..e6daba29ae 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -1019,7 +1019,7 @@ desc = "A sleek headset used by The Colonial Marshal Bureau, crafted in Sol. Low profile and comfortable. No one is above the law. Featured channels include: ; - CMB, :o - Colony, :g - public, :v - marine command, :m - medbay, :t - intel." frequency = CMB_FREQ icon_state = "cmb_headset" - initial_keys = list(/obj/item/device/encryptionkey/cmb) + initial_keys = list(/obj/item/device/encryptionkey/colony) has_hud = TRUE hud_type = MOB_HUD_FACTION_USCM diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 693acd61ef..04e765dec5 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -406,18 +406,20 @@ /obj/item/storage/belt/security/MP name = "\improper M276 pattern military police rig" desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is filled with an array of small pouches, meant to carry non-lethal equipment and restraints." - storage_slots = 6 + storage_slots = 8 max_w_class = SIZE_MEDIUM max_storage_space = 30 /obj/item/storage/belt/security/MP/full/fill_preset_inventory() new /obj/item/weapon/gun/energy/taser(src) - new /obj/item/device/flash(src) new /obj/item/weapon/baton(src) new /obj/item/handcuffs(src) + new /obj/item/handcuffs(src) + new /obj/item/handcuffs(src) new /obj/item/reagent_container/spray/pepper(src) - new /obj/item/device/clue_scanner(src) + new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src) + new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src) /obj/item/storage/belt/security/MP/UPP @@ -439,15 +441,25 @@ max_w_class = SIZE_MEDIUM max_storage_space = 30 -/obj/item/storage/belt/security/MP/CMB/full/fill_preset_inventory() +/obj/item/storage/belt/security/MP/CMB/full/revolver/fill_preset_inventory() new /obj/item/weapon/gun/energy/taser(src) - new /obj/item/device/flash(src) new /obj/item/weapon/baton(src) new /obj/item/reagent_container/spray/pepper(src) - new /obj/item/device/clue_scanner(src) new /obj/item/handcuffs(src) new /obj/item/handcuffs(src) - new /obj/item/explosive/grenade/flashbang(src) + new /obj/item/handcuffs(src) + new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src) + new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src) + +/obj/item/storage/belt/security/MP/CMB/full/highpower/fill_preset_inventory() + new /obj/item/weapon/gun/energy/taser(src) + new /obj/item/weapon/baton(src) + new /obj/item/reagent_container/spray/pepper(src) + new /obj/item/handcuffs(src) + new /obj/item/handcuffs(src) + new /obj/item/handcuffs(src) + new /obj/item/ammo_magazine/pistol/highpower(src) + new /obj/item/ammo_magazine/pistol/highpower(src) /obj/item/storage/belt/security/MP/CMB/synth/fill_preset_inventory() new /obj/item/explosive/grenade/flashbang(src) @@ -1175,12 +1187,12 @@ /obj/item/storage/belt/gun/m4a3/mod88/fill_preset_inventory() handle_item_insertion(new /obj/item/weapon/gun/pistol/mod88()) for(var/i = 1 to storage_slots - 1) - new /obj/item/ammo_magazine/pistol/mod88(src) + new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src) /obj/item/storage/belt/gun/m4a3/mod88_near_empty/fill_preset_inventory() handle_item_insertion(new /obj/item/weapon/gun/pistol/mod88()) for(var/i = 1 to 3) - new /obj/item/ammo_magazine/pistol/mod88(src) + new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src) /obj/item/storage/belt/gun/m4a3/vp78/fill_preset_inventory() handle_item_insertion(new /obj/item/weapon/gun/pistol/vp78()) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 36149138a6..e1f4a17204 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -461,7 +461,7 @@ /obj/item/storage/pouch/magazine/pistol/pmc_mod88/fill_preset_inventory() for(var/i = 1 to storage_slots) - new /obj/item/ammo_magazine/pistol/mod88(src) + new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src) /obj/item/storage/pouch/magazine/pistol/pmc_vp78/fill_preset_inventory() for(var/i = 1 to storage_slots) diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 1c9f7ea929..f6a3297148 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -615,7 +615,7 @@ /obj/item/clothing/head/CMB name = "\improper Colonial Marshal Bureau cap" - desc = "A dark cap enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol." + desc = "A black cap boldly presenting the acronym 'CMB'. Made using durable fabric, it might stop a very low caliber round from penetrating it, or a stab from piercing it. That isn't to say you won't have a dent in your head." icon = 'icons/obj/items/clothing/cm_hats.dmi' item_icons = list( WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index f9edccf774..6bfccf215d 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -192,7 +192,6 @@ armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_MEDIUM flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEJUMPSUIT siemens_coefficient = 0.5 time_to_unequip = 20 time_to_equip = 20 diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 72d0400c7a..d043bba007 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -566,8 +566,10 @@ /obj/item/clothing/suit/storage/marine/light/vest/dcc name = "\improper M3-VL pattern flak vest" - desc = "A combination of the standard non-combat M3-VL ballistics vest and M70 flak jacket, this piece of armor has been distributed to dropship crew to keep them safe from threats external and internal..." + desc = "Effectively a combination of the M3-VL ballistics vest and M70 flak jacket, this armor is used by primarily by flight personnel because of its combined flak and ballistic defense and high mobility. It is also typically worn by military police officers as a result of the blunt force protection offered by the aforementioned armor layering." icon_state = "VL_FLAK" + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bomb = CLOTHING_ARMOR_MEDIUM storage_slots = 2 /obj/item/clothing/suit/storage/marine/light/synvest @@ -1529,7 +1531,7 @@ /obj/item/clothing/suit/storage/CMB name = "\improper CMB Deputy jacket" - desc = "A thick and stylish black leather jacket with a Marshal's Deputy badge pinned to it. The back is enscribed with the powerful letters of 'DEPUTY' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol." + desc = "A polyster blue bomber jacket enforced with light ballistic weaving. It has a Marshal's Deputy badge pinned to it. The back is enscribed with the word 'DEPUTY'." icon_state = "CMB_jacket" item_state = "CMB_jacket" blood_overlay_type = "coat" @@ -1580,7 +1582,7 @@ /obj/item/clothing/suit/storage/CMB/marshal name = "\improper CMB Marshal jacket" - desc = "A thick and stylish black leather jacket with a Marshal's badge pinned to it. The back is enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol." + desc = "A thick and stylish black leather bomber jacket with a Marshal's badge pinned to it. The back is enscribed with the word 'MARSHAL'." icon_state = "CMB_jacket_marshal" item_state = "CMB_jacket_marshal" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index e1c029bae3..db82f31c0e 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -363,6 +363,13 @@ desc = "An armband, worn by the rookie nurses to display they are still not doctors. This one is dark red." icon_state = "nurse" +/obj/item/clothing/accessory/armband/mpsec + name = "military police armband" + desc = "An armband used by military police officers to denote their position." + icon_state = "armband_mp" + slot = ACCESSORY_SLOT_ARMBAND + jumpsuit_hide_states = (UNIFORM_SLEEVE_CUT|UNIFORM_JACKET_REMOVED) + //patches /obj/item/clothing/accessory/patch name = "USCM patch" diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index 7184827fda..b5c29ef21b 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -370,9 +370,9 @@ /obj/item/storage/box/guncase/mod88/fill_preset_inventory() new /obj/item/attachable/flashlight(src) new /obj/item/weapon/gun/pistol/mod88(src) - new /obj/item/ammo_magazine/pistol/mod88(src) - new /obj/item/ammo_magazine/pistol/mod88(src) - new /obj/item/ammo_magazine/pistol/mod88(src) + new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src) + new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src) + new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src) //M44 Combat Revolver /obj/item/storage/box/guncase/m44 diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 12174a5d51..0f5f67e071 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -6,24 +6,19 @@ idtype = /obj/item/card/id/deputy languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) var/human_versus_human = FALSE - var/headset_type = /obj/item/device/radio/headset/distress/CMB + var/headset_type = /obj/item/device/radio/headset/distress/CMB/limited /datum/equipment_preset/cmb/New() . = ..() access = get_access(ACCESS_LIST_UA) -/datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human) +/datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(80;MALE,20;FEMALE) - var/datum/preferences/A = new() + 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] @@ -36,15 +31,12 @@ new_human.g_eyes = colors[eye_color][2] new_human.b_eyes = colors[eye_color][3] 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", "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", "Mulder", "Pvt. Redding", "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,35) /datum/equipment_preset/cmb/load_id(mob/living/carbon/human/new_human, client/mob_client) if(human_versus_human) @@ -70,24 +62,17 @@ 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/CM_uniform, 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/mask/cigarette, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) switch(choice) if(1 to 6) @@ -95,9 +80,9 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) @@ -105,15 +90,17 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - if(7 to 8) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + if(7 to 9) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/highpower, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) @@ -121,20 +108,23 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - if(9 to 10) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + if(10) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) //*****************************************************************************************************/ @@ -160,17 +150,13 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) - 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/mask/cigarette/cigar, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/marshal, 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/weapon/telebaton, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) //pouches new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) @@ -182,15 +168,11 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) //backpack - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15/rubber, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon/cmb, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //*****************************************************************************************************/ /datum/equipment_preset/cmb/synth @@ -315,8 +297,8 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow, WEAR_JACKET) diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 0ead4f713c..108aca26d9 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -1,14 +1,14 @@ /datum/equipment_preset/uscm_ship/uscm_police name = "USCM (police roles)" faction = FACTION_MARINE - minimum_age = 27 + minimum_age = 22 //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/mp name = "USCM Military Police (MP)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE - + idtype = /obj/item/card/id/dogtag access = list( ACCESS_MARINE_BRIG, ACCESS_MARINE_COMMAND, @@ -34,29 +34,29 @@ minimap_icon = "mp" utility_under = list(/obj/item/clothing/under/marine/mp) - utility_hat = list(/obj/item/clothing/head/beret/marine/mp) - utility_extra = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/cm/tan) + utility_hat = list(/obj/item/clothing/head/cmcap) + utility_extra = list(/obj/item/clothing/head/cmcap) - service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service/mp) + service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service) /datum/equipment_preset/uscm_ship/uscm_police/mp/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec + var/back_item = /obj/item/storage/backpack/marine/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security + back_item = /obj/item/storage/backpack/marine/satchel new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mmpo(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/armband/mpsec(new_human), WEAR_ACCESSORY) + 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/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/MP(new_human), WEAR_JACKET) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp(new_human), WEAR_HEAD) + 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 back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) /datum/equipment_preset/uscm_ship/uscm_police/mp/load_rank(mob/living/carbon/human/human) @@ -69,7 +69,7 @@ /datum/equipment_preset/uscm_ship/uscm_police/warden name = "USCM Military Warden (MW)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE - idtype = /obj/item/card/id/silver + idtype = /obj/item/card/id/dogtag access = list( ACCESS_MARINE_BRIG, @@ -97,30 +97,29 @@ minimap_icon = "warden" utility_under = list(/obj/item/clothing/under/marine/warden) - utility_hat = list(/obj/item/clothing/head/beret/marine/mp/warden) - utility_extra = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/cm/tan) + utility_hat = list(/obj/item/clothing/head/cmcap) - service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service/warden) + service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service) /datum/equipment_preset/uscm_ship/uscm_police/warden/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec + var/back_item = /obj/item/storage/backpack/marine/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security + back_item = /obj/item/storage/backpack/marine/satchel - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/warden(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mmpo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/armband/mpsec(new_human), WEAR_ACCESSORY) + 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/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/MP/warden(new_human), WEAR_JACKET) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/warden(new_human), WEAR_HEAD) + 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 back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -165,25 +164,24 @@ service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service/cmp) /datum/equipment_preset/uscm_ship/uscm_police/cmp/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec + var/back_item = /obj/item/storage/backpack/marine/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security + back_item = /obj/item/storage/backpack/marine/satchel - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/warrant(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mmpo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/armband/mpsec(new_human), WEAR_ACCESSORY) + 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/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/MP/WO(new_human), WEAR_JACKET) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/cmp(new_human), WEAR_HEAD) + 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 back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 5644e8c515..905fa8265b 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -5,6 +5,32 @@ minimum_age = 20 languages = list(LANGUAGE_ENGLISH) +/datum/equipment_preset/uscm_ship/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(75;MALE,25;FEMALE) + var/datum/preferences/A = new + A.randomize_appearance(new_human) + 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] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] + var/eye_color = pick(colors) + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] + if(new_human.gender == MALE) + new_human.h_style = pick("Undercut", "Partly Shaved", "Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "Medium Fade", "High Fade", "Coffee House Cut") + new_human.f_style = pick("Shaved", "Shaved", "Shaved", "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("Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "CIA", "Mulder", "Pvt. Redding", "Pixie Cut Left", "Pixie Cut Right", "Bun") + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,35) + utility_under = list(/obj/item/clothing/under/marine/officer/command) utility_hat = list(/obj/item/clothing/head/cmcap) utility_gloves = list(/obj/item/clothing/gloves/marine) diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index 320693db36..4f09acbf11 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -354,12 +354,12 @@ //-----------------------88M4 Pistol Mag Box----------------------- /obj/item/ammo_box/magazine/mod88 - name = "\improper magazine box (88 Mod 4 AP x 16)" + name = "\improper magazine box (88 Mod 4 x 16)" icon_state = "base_mod88" flags_equip_slot = SLOT_BACK - overlay_ammo_type = "_ap" + overlay_ammo_type = "_reg" overlay_gun_type = "_mod88" - overlay_content = "_ap" + overlay_content = "_reg" num_of_magazines = 16 magazine_type = /obj/item/ammo_magazine/pistol/mod88 diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index 7dff109572..ae8bef53f6 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -594,7 +594,7 @@ firesound_volume = 20 reload_sound = 'sound/weapons/gun_88m4_reload.ogg' unload_sound = 'sound/weapons/gun_88m4_unload.ogg' - current_mag = /obj/item/ammo_magazine/pistol/mod88 + current_mag = /obj/item/ammo_magazine/pistol/mod88/normalpoint force = 8 flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER attachable_allowed = list( @@ -626,7 +626,7 @@ scatter = SCATTER_AMOUNT_TIER_7 burst_scatter_mult = SCATTER_AMOUNT_TIER_7 scatter_unwielded = SCATTER_AMOUNT_TIER_7 - damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_4 + damage_mult = BASE_BULLET_DAMAGE_MULT /obj/item/weapon/gun/pistol/mod88/training diff --git a/code/modules/projectiles/magazines/pistols.dm b/code/modules/projectiles/magazines/pistols.dm index 11e6fe9dbf..3ae221fd42 100644 --- a/code/modules/projectiles/magazines/pistols.dm +++ b/code/modules/projectiles/magazines/pistols.dm @@ -74,13 +74,13 @@ ammo_band_color = AMMO_BAND_COLOR_AP /obj/item/ammo_magazine/pistol/mod88/normalpoint // Unused - name = "\improper 88M4 FMJ magazine (9mm)" + name = "\improper 88M4 magazine (9mm)" default_ammo = /datum/ammo/bullet/pistol caliber = "9mm" ammo_band_color = null /obj/item/ammo_magazine/pistol/mod88/normalpoint/extended // Unused - name = "\improper 88M4 FMJ extended magazine (9mm)" + name = "\improper 88M4 extended magazine (9mm)" icon_state = "88m4_mag_ex" default_ammo = /datum/ammo/bullet/pistol caliber = "9mm" diff --git a/code/modules/vehicles/interior/interactable/vendors.dm b/code/modules/vehicles/interior/interactable/vendors.dm index f5aef4f430..aa2411f89f 100644 --- a/code/modules/vehicles/interior/interactable/vendors.dm +++ b/code/modules/vehicles/interior/interactable/vendors.dm @@ -215,9 +215,9 @@ list("M39 HV Magazine (10x20mm)", round(scale * 6), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), list("M44 Speed Loader (.44)", round(scale * 4), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 10), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), + list("88 Mod 4 Magazine (9mm)", round(scale * 8), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR), list("ARMOR-PIERCING AMMUNITION", -1, null, null), - list("88 Mod 4 AP Magazine (9mm)", round(scale * 8), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), list("M4RA AP Magazine (10x24mm)", 0, /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 0, /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR), list("M41A MK2 AP Magazine (10x24mm)", 0, /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR), diff --git a/icons/mob/humans/onmob/hands.dmi b/icons/mob/humans/onmob/hands.dmi index a79b61c98d..f174ffd1b6 100644 Binary files a/icons/mob/humans/onmob/hands.dmi and b/icons/mob/humans/onmob/hands.dmi differ diff --git a/icons/mob/humans/onmob/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi index b4475e9a8a..8d64d73ef1 100644 Binary files a/icons/mob/humans/onmob/head_0.dmi and b/icons/mob/humans/onmob/head_0.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index fcd8917c9c..169aa524d2 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi index 6bf64e7eff..9ed93efa34 100644 Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and b/icons/mob/humans/onmob/helmet_garb.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 92ae62c7bc..18b9ca5ac3 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 78e7ab199a..c3dcbe3b61 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index feedb7327b..6e58aa61b8 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 279ce1ca7b..a5e0100844 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/ties.dmi b/icons/mob/humans/onmob/ties.dmi index 4573d24239..408cf1492a 100644 Binary files a/icons/mob/humans/onmob/ties.dmi and b/icons/mob/humans/onmob/ties.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 39e3223891..8656f89278 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi index a73de66d58..ffe4c53546 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ diff --git a/icons/obj/items/clothing/ties.dmi b/icons/obj/items/clothing/ties.dmi index 6a4677c5f6..a505b419d7 100644 Binary files a/icons/obj/items/clothing/ties.dmi and b/icons/obj/items/clothing/ties.dmi differ diff --git a/icons/obj/items/clothing/ties_overlay.dmi b/icons/obj/items/clothing/ties_overlay.dmi index ab2276b00d..fd6c4204ed 100644 Binary files a/icons/obj/items/clothing/ties_overlay.dmi and b/icons/obj/items/clothing/ties_overlay.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi index 17e7e6f221..04c1fd5468 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi differ diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 60af0805d2..a87db5ef1e 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -179,7 +179,6 @@ "aaF" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ dir = 1; - locked = 0; name = "CORSAT Armory"; req_access_txt = "101" }, @@ -374,10 +373,10 @@ /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/mod88, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /turf/open/floor/corsat{ dir = 9; icon_state = "red" @@ -1008,10 +1007,10 @@ /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/mod88, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /turf/open/floor/corsat{ dir = 1; icon_state = "red" @@ -2354,7 +2353,6 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ damage_cap = 4000; dir = 1; - locked = 0; name = "\improper Emergency Access"; req_access_txt = "100"; req_one_access = null @@ -5915,7 +5913,6 @@ "arv" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ damage_cap = 4000; - locked = 0; name = "\improper Emergency Access"; req_access_txt = "100"; req_one_access = null @@ -9027,8 +9024,8 @@ /obj/item/storage/belt/security/MP/full, /obj/item/clothing/accessory/storage/holster/armpit, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/item/storage/pouch/general/medium, /obj/item/storage/pouch/pistol, /turf/open/floor/corsat{ @@ -11314,12 +11311,12 @@ /obj/item/weapon/gun/pistol/mod88, /obj/item/weapon/gun/pistol/mod88, /obj/structure/surface/rack, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /turf/open/floor/corsat{ dir = 9; icon_state = "red" @@ -13785,8 +13782,8 @@ /obj/item/storage/belt/security/MP/full, /obj/item/clothing/accessory/storage/holster/armpit, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/item/storage/pouch/general/medium, /obj/item/storage/pouch/pistol, /turf/open/floor/corsat{ @@ -19094,8 +19091,8 @@ /obj/item/storage/belt/security/MP/full, /obj/item/clothing/accessory/storage/holster/armpit, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/item/storage/pouch/general/medium, /obj/item/storage/pouch/pistol, /turf/open/floor/corsat{ @@ -19115,8 +19112,8 @@ /obj/item/storage/belt/security/MP/full, /obj/item/clothing/accessory/storage/holster/armpit, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/item/storage/pouch/general/medium, /obj/item/storage/pouch/pistol, /turf/open/floor/corsat{ @@ -21865,8 +21862,7 @@ /area/corsat/gamma/engineering) "bij" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0 + name = "Floodlight" }, /turf/open/auto_turf/snow/layer3, /area/corsat/gamma/biodome) @@ -28912,8 +28908,8 @@ /obj/item/storage/belt/security/MP/full, /obj/item/clothing/accessory/storage/holster/armpit, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/item/storage/pouch/general/medium, /obj/item/storage/pouch/pistol, /obj/structure/closet/secure_closet/security, @@ -28949,8 +28945,8 @@ /obj/item/storage/belt/security/MP/full, /obj/item/clothing/accessory/storage/holster/armpit, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/item/storage/pouch/general/medium, /obj/item/storage/pouch/pistol, /obj/structure/closet/secure_closet/security, @@ -29004,7 +29000,6 @@ /area/corsat/omega/checkpoint) "bDv" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ - locked = 0; name = "Security Armory"; req_access_txt = "101" }, @@ -30454,8 +30449,7 @@ /area/corsat/gamma/airlock/control) "bJE" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0 + name = "Floodlight" }, /turf/open/mars, /area/corsat/sigma/biodome) @@ -34240,8 +34234,7 @@ /area/corsat/sigma/airlock/control) "bVD" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0 + name = "Floodlight" }, /turf/open/floor{ dir = 1; @@ -35490,7 +35483,6 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ dir = 1; name = "Weapons Development"; - req_access = null; req_one_access_txt = "103" }, /obj/structure/pipes/standard/simple/hidden/green, @@ -35817,8 +35809,7 @@ /area/corsat/omega/control) "caS" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0 + name = "Floodlight" }, /turf/open/floor/plating, /area/corsat/sigma/biodome/testgrounds) @@ -37885,8 +37876,7 @@ /area/corsat/omega/hallways) "dFb" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0 + name = "Floodlight" }, /turf/open/auto_turf/snow/layer0, /area/corsat/gamma/biodome) @@ -43629,8 +43619,8 @@ /obj/item/storage/belt/security/MP/full, /obj/item/clothing/accessory/storage/holster/armpit, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/item/storage/pouch/general/medium, /obj/item/storage/pouch/pistol, /turf/open/floor/corsat{ @@ -48492,7 +48482,6 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ dir = 1; name = "Teleportation Lab"; - req_access = null; req_one_access_txt = "103" }, /obj/structure/pipes/standard/simple/hidden/green, @@ -49119,8 +49108,7 @@ /area/corsat/omega/airlocknorth/id) "lUY" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0 + name = "Floodlight" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/snow/layer3, @@ -51006,7 +50994,6 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ dir = 1; name = "Teleportation Chamber"; - req_access = null; req_one_access_txt = "101;103" }, /turf/open/floor/corsat{ @@ -58931,8 +58918,8 @@ /obj/item/storage/belt/security/MP/full, /obj/item/clothing/accessory/storage/holster/armpit, /obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/item/storage/pouch/general/medium, /obj/item/storage/pouch/pistol, /turf/open/floor/corsat{ @@ -61765,7 +61752,6 @@ "vqF" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ damage_cap = 4000; - locked = 0; name = "\improper Emergency Access"; req_access_txt = "100"; req_one_access = null diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index a376e1173d..be2e218d2f 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -1838,9 +1838,7 @@ /area/varadero/interior/hall_N) "bhU" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -10520,9 +10518,7 @@ /area/varadero/interior/security) "gRU" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) @@ -13553,9 +13549,7 @@ /area/varadero/interior/administration) "iWX" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/eastbeach) @@ -19007,9 +19001,7 @@ /area/varadero/interior/cargo) "mtp" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -19121,9 +19113,7 @@ /area/varadero/interior/hall_SE) "mvO" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/floor/shiva{ dir = 1; @@ -19646,9 +19636,7 @@ dir = 1 }, /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/floor/shiva{ dir = 1; @@ -28691,30 +28679,15 @@ /area/varadero/interior/maintenance/security) "syb" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/structure/machinery/light{ dir = 4 }, diff --git a/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm b/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm index 5c12a0b028..1413a053bc 100644 --- a/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm +++ b/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm @@ -1723,9 +1723,7 @@ /area/varadero/interior/hall_N) "bhU" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -9885,9 +9883,7 @@ /area/varadero/interior/security) "gRU" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) @@ -12618,9 +12614,7 @@ /area/varadero/interior/administration) "iWX" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/eastbeach) @@ -17806,9 +17800,7 @@ /area/varadero/interior/cargo) "mtp" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -17888,9 +17880,7 @@ /area/varadero/interior/hall_SE) "mvO" = ( /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/floor/shiva{ dir = 1; @@ -18376,9 +18366,7 @@ dir = 1 }, /obj/structure/machinery/floodlight{ - name = "Floodlight"; - unacidable = 0; - wrenchable = 1 + name = "Floodlight" }, /turf/open/floor/shiva{ dir = 1; @@ -26906,30 +26894,15 @@ /area/varadero/interior/maintenance/security) "syb" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /obj/structure/machinery/light{ dir = 4 }, diff --git a/maps/shuttles/ert_shuttle_big.dmm b/maps/shuttles/ert_shuttle_big.dmm index f3983899e2..96fb88a3ea 100644 --- a/maps/shuttles/ert_shuttle_big.dmm +++ b/maps/shuttles/ert_shuttle_big.dmm @@ -25,12 +25,8 @@ /obj/item/weapon/gun/pistol/mod88{ pixel_y = 4 }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = 5 - }, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, +/obj/item/ammo_magazine/pistol/mod88/normalpoint, /turf/open/floor/almayer{ icon_state = "plate" },