diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index 92a4890aa6c..eff622e43a6 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -33747,15 +33747,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) -"tTz" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/turf/open/floor/mainship/emerald/full, -/area/mainship/hallways/hangar) "tTI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 8 @@ -74729,7 +74720,7 @@ mor hjJ qVS wfg -tTz +wfg cir qMe iwc diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm index ea89848b295..42e661ee2e1 100644 --- a/code/__DEFINES/conflict.dm +++ b/code/__DEFINES/conflict.dm @@ -74,7 +74,7 @@ ///If the projectile ricochet and miss sound is pitched up #define AMMO_SOUND_PITCH (1<<16) ///Used to identify ammo from sentry guns and other other automated sources -#define AMMO_SENTRY (1<<17) +#define AMMO_SENTRY (1<<17) //Gun defines for gun related thing. More in the projectile folder. //flags_gun_features @@ -137,10 +137,10 @@ //Slowdown from various armors. #define SHOES_SLOWDOWN -1.0 // How much shoes slow you down by default. Negative values speed you up -#define SLOWDOWN_ARMOR_VERY_LIGHT 0.20 +#define SLOWDOWN_ARMOR_VERY_LIGHT 0.25 #define SLOWDOWN_ARMOR_LIGHT 0.3 #define SLOWDOWN_ARMOR_MEDIUM 0.5 -#define SLOWDOWN_ARMOR_HEAVY 0.7 +#define SLOWDOWN_ARMOR_HEAVY 0.75 #define SLOWDOWN_ARMOR_VERY_HEAVY 1 diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 19c1d532ded..480cba8d0f8 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -73,7 +73,6 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), /obj/vehicle/ridden/motorbike = list(CAT_MARINE, "Bike", 30, "blue"), /obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"), - /obj/item/research_product/money/basic = list(CAT_MARINE, "50 credits coin", 8, "yellow2"), )) GLOBAL_LIST_INIT(robot_gear_listed_products, list( @@ -86,7 +85,6 @@ GLOBAL_LIST_INIT(robot_gear_listed_products, list( /obj/item/cell/lasgun/lasrifle/recharger = list(CAT_ROBOT, "Terra Experimental recharger battery", 4, "orange2"), /obj/item/tool/handheld_charger = list(CAT_ROBOT, "Hand-held cell charger", 5, "yellow"), /obj/item/weapon/powerfist = list(CAT_ROBOT, "Powerfist", 10, "red"), - /obj/item/research_product/money/basic = list(CAT_ROBOT, "50 credits coin", 8, "yellow2"), )) GLOBAL_LIST_INIT(engineer_gear_listed_products, list( @@ -129,7 +127,6 @@ GLOBAL_LIST_INIT(engineer_gear_listed_products, list( /obj/item/mortal_shell/smoke = list(CAT_ENGSUP, "Smoke Mortar shell", 1, "orange2"), /obj/item/mortal_shell/flare = list(CAT_ENGSUP, "Flare Mortar shell", 1, "orange2"), /obj/item/ammo_magazine/flamer_tank/large = list(CAT_ENGSUP, "Flamethrower tank", 1, "orange2"), - /obj/item/research_product/money/basic = list(CAT_ENGSUP, "50 credits coin", 8, "yellow2"), )) GLOBAL_LIST_INIT(medic_gear_listed_products, list( @@ -168,7 +165,6 @@ GLOBAL_LIST_INIT(medic_gear_listed_products, list( /obj/item/tweezers_advanced = list(CAT_MEDSUP, "Advanced Tweezers", 8, "yellow"), /obj/effect/vendor_bundle/stretcher = list(CAT_MEDSUP, "Medivac Stretcher", 20, "yellow"), /obj/item/deployable_optable = list(CAT_MEDSUP, "Deployable Operating Table", 12, "yellow"), - /obj/item/research_product/money/basic = list(CAT_MEDSUP, "50 credits coin", 8, "yellow2"), )) GLOBAL_LIST_INIT(leader_gear_listed_products, list( @@ -225,7 +221,6 @@ GLOBAL_LIST_INIT(leader_gear_listed_products, list( /obj/item/storage/firstaid/adv = list(CAT_LEDSUP, "Advanced firstaid kit", 1, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_LEDSUP, "Injector (Synaptizine)", 2, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = list(CAT_LEDSUP, "Injector (Advanced)", 2, "cyan"), - /obj/item/research_product/money/basic = list(CAT_LEDSUP, "50 credits coin", 8, "yellow2"), )) GLOBAL_LIST_INIT(commander_gear_listed_products, list( @@ -308,7 +303,6 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list( /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = list(CAT_FCSUP, "Injector (Advanced)", 2, "cyan"), /obj/item/stack/medical/heal_pack/advanced/bruise_combat_pack = list(CAT_FCSUP, "Combat Trauma Kit", 2, "cyan"), /obj/item/stack/medical/heal_pack/advanced/burn_combat_pack = list(CAT_FCSUP, "Combat Burn Kit", 2, "cyan"), - /obj/item/research_product/money/basic = list(CAT_FCSUP, "50 credits coin", 8, "yellow2"), )) //A way to give them everything at once that still works with loadouts would be nice, but barring that make sure that your point calculation is set up so they don't get more than what they're supposed to @@ -333,7 +327,6 @@ GLOBAL_LIST_INIT(smartgunner_gear_listed_products, list( /obj/item/ammo_magazine/rifle/sg153/plasmaloss = list(CAT_SGSUP, "SG-153 Spotting Rifle Tanglefoot Magazine", 3, "orange2"), /obj/item/ammo_magazine/rifle/sg153/incendiary = list(CAT_SGSUP, "SG-153 Spotting Rifle Incendiary Magazine", 3, "orange2"), /obj/item/ammo_magazine/pistol/p14/smart_pistol = list(CAT_SGSUP, "SP-13 smart pistol ammo", 2, "orange2"), - /obj/item/research_product/money/basic = list(CAT_SGSUP, "50 credits coin", 6, "yellow2"), )) GLOBAL_LIST_INIT(synthetic_gear_listed_products, list( @@ -395,7 +388,6 @@ GLOBAL_LIST_INIT(synthetic_gear_listed_products, list( /obj/item/tweezers_advanced = list(CAT_SYNTH, "Advanced Tweezers", 8, "yellow"), /obj/effect/vendor_bundle/stretcher = list(CAT_SYNTH, "Medivac Stretcher", 20, "yellow"), /obj/item/deployable_optable = list(CAT_SYNTH, "Deployable Operating Table", 12, "yellow"), - /obj/item/research_product/money/basic = list(CAT_SYNTH, "50 credits coin", 8, "yellow2"), )) ///Assoc list linking the job title with their specific points vendor diff --git a/code/datums/jobs/job/freelancers.dm b/code/datums/jobs/job/freelancers.dm index 12802e969e6..997c79b90d7 100644 --- a/code/datums/jobs/job/freelancers.dm +++ b/code/datums/jobs/job/freelancers.dm @@ -206,9 +206,9 @@ H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) @@ -231,9 +231,9 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) @@ -263,14 +263,14 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BACKPACK) - + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar12, SLOT_IN_R_POUCH) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar12, SLOT_IN_R_POUCH) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar12, SLOT_IN_R_POUCH) @@ -312,8 +312,8 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) @@ -337,8 +337,8 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar11, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar11, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) @@ -365,8 +365,8 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar12, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar12, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar12, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar12, SLOT_IN_R_POUCH) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ar12, SLOT_IN_R_POUCH) diff --git a/code/modules/clothing/modular_armor/attachments/chest_plates.dm b/code/modules/clothing/modular_armor/attachments/chest_plates.dm index 3aeb25e1334..c92a743f124 100644 --- a/code/modules/clothing/modular_armor/attachments/chest_plates.dm +++ b/code/modules/clothing/modular_armor/attachments/chest_plates.dm @@ -36,7 +36,7 @@ name = "\improper Jaeger Pattern Heavy Assault chestplates" desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Assault armor piece." soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 30, BIO = 50, FIRE = 15, ACID = 55) - slowdown = SLOWDOWN_ARMOR_VERY_HEAVY + slowdown = SLOWDOWN_ARMOR_HEAVY greyscale_config = /datum/greyscale_config/armor_mk1 /obj/item/armor_module/armor/chest/marine/eva diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index ded48b5ef70..fbcdfc717f0 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -480,7 +480,7 @@ icon_state = "style_heavy" item_state = "style_heavy_a" soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 50, ACID = 60) - slowdown = SLOWDOWN_ARMOR_VERY_HEAVY + slowdown = SLOWDOWN_ARMOR_HEAVY /** * Helmet Modules diff --git a/code/modules/clothing/modular_armor/combat_robot.dm b/code/modules/clothing/modular_armor/combat_robot.dm index fd84f00e9d0..2950fbc8d37 100644 --- a/code/modules/clothing/modular_armor/combat_robot.dm +++ b/code/modules/clothing/modular_armor/combat_robot.dm @@ -7,7 +7,7 @@ icon_state = "chest" item_state = "chest" species_exception = list(/datum/species/robot) - soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45) + soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 20, BIO = 40, FIRE = 10, ACID = 45) slowdown = SLOWDOWN_ARMOR_MEDIUM colorable_colors = ARMOR_PALETTES_LIST @@ -51,15 +51,15 @@ /obj/item/clothing/suit/modular/robot/light name = "XR-1-L armor plating" desc = "Light armor plating designed for self mounting on TerraGov combat robotics. It has self-sealing bolts for mounting on robotic owners inside." - soft_armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 30, BOMB = 30, BIO = 30, FIRE = 5, ACID = 35) + soft_armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 30, BOMB = 10, BIO = 30, FIRE = 5, ACID = 35) slowdown = SLOWDOWN_ARMOR_VERY_LIGHT greyscale_config = /datum/greyscale_config/robot/light /obj/item/clothing/suit/modular/robot/heavy name = "XR-1-H armor plating" desc = "Heavy armor plating designed for self mounting on TerraGov combat robotics. It has self-sealing bolts for mounting on robotic owners inside." - soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55) - slowdown = SLOWDOWN_ARMOR_VERY_HEAVY + soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 30, BIO = 50, FIRE = 15, ACID = 55) + slowdown = SLOWDOWN_ARMOR_HEAVY greyscale_config = /datum/greyscale_config/robot/heavy /obj/item/clothing/suit/modular/robot/heavy/tyr diff --git a/code/modules/clothing/modular_armor/jaeger.dm b/code/modules/clothing/modular_armor/jaeger.dm index d33601a61fb..3d8a535990f 100644 --- a/code/modules/clothing/modular_armor/jaeger.dm +++ b/code/modules/clothing/modular_armor/jaeger.dm @@ -90,7 +90,7 @@ name = "\improper Jaeger Gungnir heavy exoskeleton" desc = "A Gungnir-pattern Jaeger combat exoskeleton made to work with modular attachments for the ability to function in many enviroments. This one seems to have a high amount of armor plating. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 30, BIO = 50, FIRE = 15, ACID = 55) - slowdown = SLOWDOWN_ARMOR_VERY_HEAVY + slowdown = SLOWDOWN_ARMOR_HEAVY greyscale_config = /datum/greyscale_config/armor_mk2/gugnir /obj/item/clothing/suit/modular/jaeger/heavy/assault diff --git a/code/modules/clothing/modular_armor/xenonauten.dm b/code/modules/clothing/modular_armor/xenonauten.dm index c1f7bad71da..000d04bfef2 100644 --- a/code/modules/clothing/modular_armor/xenonauten.dm +++ b/code/modules/clothing/modular_armor/xenonauten.dm @@ -86,7 +86,7 @@ name = "\improper Xenonauten-H pattern armored vest" desc = "A XN-H vest, also known as Xenonauten, a set vest with modular attachments made to work in many enviroments. This one seems to be a heavy variant. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 30, BIO = 50, FIRE = 15, ACID = 55) - slowdown = SLOWDOWN_ARMOR_VERY_HEAVY + slowdown = SLOWDOWN_ARMOR_HEAVY greyscale_config = /datum/greyscale_config/xenonaut/heavy /obj/item/clothing/suit/modular/xenonauten/heavy/leader diff --git a/icons/mob/items_lefthand_1.dmi b/icons/mob/items_lefthand_1.dmi index 3db4b96891f..6c15a3b56bb 100644 Binary files a/icons/mob/items_lefthand_1.dmi and b/icons/mob/items_lefthand_1.dmi differ