diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index c3322b310d..acf7e19f75 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -263,3 +263,7 @@ return else return ..() + +/obj/structure/reflector/shuttleRotate(rotation, params) + . = ..() + setAngle(SIMPLIFY_DEGREES(rotation_angle + rotation)) diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index 1f1211a3a4..b8818ef3f7 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -21,7 +21,7 @@ return TRUE return FALSE -/obj/item/mecha_parts/mecha_equipment/weapon/action(mob/source, atom/target, params) +/obj/item/mecha_parts/mecha_equipment/weapon/action(mob/source, atom/target, list/modifiers) if(!action_checks(target)) return FALSE var/newtonian_target = turn(chassis.dir,180) @@ -36,20 +36,23 @@ else spread = round((i / projectiles_per_shot - 0.5) * variance) - var/obj/item/projectile/A = new projectile(get_turf(src)) - A.preparePixelProjectile(target, source, params, spread) + var/obj/item/projectile/projectile_obj = new projectile(get_turf(src)) + projectile_obj.log_override = TRUE //we log being fired ourselves a little further down. + projectile_obj.firer = chassis + projectile_obj.preparePixelProjectile(target, source, modifiers, spread) - A.fire() - if(!A.suppressed && firing_effect_type) + projectile_obj.fire() + if(!projectile_obj.suppressed && firing_effect_type) new firing_effect_type(get_turf(src), chassis.dir) playsound(chassis, fire_sound, 50, TRUE) + log_combat(source, target, "fired [projectile_obj] at", src, "from [chassis] at [get_area_name(src, TRUE)]") + sleep(max(0, projectile_delay)) if(kickback) chassis.newtonian_move(newtonian_target) - chassis.log_message("Fired from [src.name], targeting [target].", LOG_MECHA) - return ..() + chassis.log_message("[key_name(source)] fired [src], targeting [target].", LOG_ATTACK) //Base energy weapon type /obj/item/mecha_parts/mecha_equipment/weapon/energy diff --git a/html/changelogs/archive/2023-03.yml b/html/changelogs/archive/2023-03.yml index c36126afbd..b364f05cac 100644 --- a/html/changelogs/archive/2023-03.yml +++ b/html/changelogs/archive/2023-03.yml @@ -74,5 +74,7 @@ 2023-03-14: BongaTheProto: - bugfix: Makes you able to interact with mobs you pick up again + Dexxiol: + - imageadd: fixed cargo technician rolled up sleeves, duffelbags and yoga pants LeDrascol: - tweak: Reverted R&D consoles locking by default diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 070878f50b..7665ddc951 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 753ed9a4a2..a171971568 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index b274dd090e..dbe356c54f 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/modular_sand/code/datums/components/interaction_menu_granter.dm b/modular_sand/code/datums/components/interaction_menu_granter.dm index 97389f2be0..89ea6ff046 100644 --- a/modular_sand/code/datums/components/interaction_menu_granter.dm +++ b/modular_sand/code/datums/components/interaction_menu_granter.dm @@ -93,9 +93,6 @@ if(HAS_TRAIT(user, TRAIT_ESTROUS_DETECT)) .["theirLust"] = target.get_lust() .["theirMaxLust"] = target.get_lust_tolerance() * 3 - else - .["theirLust"] = null - .["theirMaxLust"] = null //Getting interactions var/list/sent_interactions = list()