From 7fc7d5888aea3f4e3c68402fcce76911e61492cf Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 18 Jul 2020 20:39:05 -0700 Subject: [PATCH 01/12] Update _movespeed_modifier.dm --- code/modules/movespeed/_movespeed_modifier.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm index a338919c4b..69fa7dba85 100644 --- a/code/modules/movespeed/_movespeed_modifier.dm +++ b/code/modules/movespeed/_movespeed_modifier.dm @@ -199,7 +199,12 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache) else continue . += amt + var/old = cached_multiplicative_slowdown // CITAEDL EDIT - To make things a bit less jarring, when in situations where + // your delay decreases, "give" the delay back to the client cached_multiplicative_slowdown = . + var/diff = old - cached_multiplicative_slowdown + if(diff > 0) + client.move_delay -= diff /// Get the move speed modifiers list of the mob /mob/proc/get_movespeed_modifiers() From a0250cfaaad763aff0dff89be442cd4f99613bfc Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 18 Jul 2020 20:42:39 -0700 Subject: [PATCH 02/12] Update _movespeed_modifier.dm --- code/modules/movespeed/_movespeed_modifier.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm index 69fa7dba85..3bc4463531 100644 --- a/code/modules/movespeed/_movespeed_modifier.dm +++ b/code/modules/movespeed/_movespeed_modifier.dm @@ -203,8 +203,9 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache) // your delay decreases, "give" the delay back to the client cached_multiplicative_slowdown = . var/diff = old - cached_multiplicative_slowdown - if(diff > 0) - client.move_delay -= diff + if((diff > 0) && client) + if(client.move_delay > world.time + 1.5) + client.move_delay -= diff /// Get the move speed modifiers list of the mob /mob/proc/get_movespeed_modifiers() From 3a83c526b6b96e2dd303433a4f6ef9b4dadd6120 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 21 Jul 2020 19:36:37 -0700 Subject: [PATCH 03/12] Update gun.dm --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index b90f0aee0d..d6bdd50d15 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -182,7 +182,7 @@ return if(!ismob(target) || user.a_intent == INTENT_HARM) //melee attack return - if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH) //so we can't shoot ourselves (unless mouth selected) + if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH && (user.a_intent != INTENT_DISARM)) //so we can't shoot ourselves (unless mouth selected) return if(istype(user))//Check if the user can use the gun, if the user isn't alive(turrets) assume it can. From 3ed854bdb3c39d164e218de33887101ad9979a0e Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 21 Jul 2020 19:38:38 -0700 Subject: [PATCH 04/12] Update gun.dm --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index d6bdd50d15..aedb1dbf63 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -182,7 +182,7 @@ return if(!ismob(target) || user.a_intent == INTENT_HARM) //melee attack return - if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH && (user.a_intent != INTENT_DISARM)) //so we can't shoot ourselves (unless mouth selected) + if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH && (user.a_intent != INTENT_DISARM)) //so we can't shoot ourselves (unless mouth selected or disarm intent) return if(istype(user))//Check if the user can use the gun, if the user isn't alive(turrets) assume it can. From 1c4249c99d063656dbea6526c7f6df0024647bde Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 24 Jul 2020 00:57:30 -0700 Subject: [PATCH 05/12] Update medbeam.dm --- code/modules/projectiles/guns/misc/medbeam.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/misc/medbeam.dm b/code/modules/projectiles/guns/misc/medbeam.dm index e841422893..6864dad33e 100644 --- a/code/modules/projectiles/guns/misc/medbeam.dm +++ b/code/modules/projectiles/guns/misc/medbeam.dm @@ -47,7 +47,7 @@ if(current_target) LoseTarget() - if(!isliving(target)) + if(!isliving(target) || (user == target)) return current_target = target From c3be76b5290f0ef9e25dfa1dbd0b235310b5a219 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 24 Jul 2020 19:32:51 -0700 Subject: [PATCH 06/12] Update neck.dm --- modular_citadel/code/modules/client/loadout/neck.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm index 320a83b87d..95e6fd3aca 100644 --- a/modular_citadel/code/modules/client/loadout/neck.dm +++ b/modular_citadel/code/modules/client/loadout/neck.dm @@ -92,3 +92,8 @@ name = "Headphones" category = SLOT_NECK path = /obj/item/clothing/ears/headphones + +/datum/gear/polycloak + name = "Polychromatic Cloak" + category = SLOT_NECK + path = /obj/item/clothing/neck/cloak/polychromatic From c4ec1dfdc191bc2122ea19a5b4af5287ad94a4a2 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 24 Jul 2020 20:50:52 -0700 Subject: [PATCH 07/12] Update neck.dm --- modular_citadel/code/modules/client/loadout/neck.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm index 95e6fd3aca..0f69296406 100644 --- a/modular_citadel/code/modules/client/loadout/neck.dm +++ b/modular_citadel/code/modules/client/loadout/neck.dm @@ -96,4 +96,4 @@ /datum/gear/polycloak name = "Polychromatic Cloak" category = SLOT_NECK - path = /obj/item/clothing/neck/cloak/polychromatic + path = /obj/item/clothing/neck/cloak/polychromic From 23465355d085f197714a7d52ff32afc362815cf2 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 24 Jul 2020 22:16:06 -0700 Subject: [PATCH 08/12] Update stun.dm --- code/modules/projectiles/guns/energy/stun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index d700db817c..6c75ac2d4d 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -24,7 +24,7 @@ ammo_x_offset = 2 // Not enough guns have altfire systems like this yet for this to be a universal framework. var/last_altfire = 0 - var/altfire_delay = 15 + var/altfire_delay = CLICK_CD_RANGE /obj/item/gun/energy/e_gun/advtaser/altafterattack(atom/target, mob/user, proximity_flag, params) . = TRUE From f9265c6b5ebdd170203431b774058ee1565c2bce Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 27 Jul 2020 08:27:10 -0500 Subject: [PATCH 09/12] Automatic changelog generation for PR #12888 [ci skip] --- html/changelogs/AutoChangeLog-pr-12888.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12888.yml diff --git a/html/changelogs/AutoChangeLog-pr-12888.yml b/html/changelogs/AutoChangeLog-pr-12888.yml new file mode 100644 index 0000000000..135bd0a2ed --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12888.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscdel: "no more self healing with medibeam guns" From 533bf331e2fb6b91f7bb86af6eb2808278df9681 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 27 Jul 2020 11:39:32 -0500 Subject: [PATCH 10/12] Automatic changelog generation for PR #12898 [ci skip] --- html/changelogs/AutoChangeLog-pr-12898.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12898.yml diff --git a/html/changelogs/AutoChangeLog-pr-12898.yml b/html/changelogs/AutoChangeLog-pr-12898.yml new file mode 100644 index 0000000000..52e0789c1f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12898.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscadd: "polychromatic cloaks to loadout" From 2e63621de3392d88f776461fad805c5ba086c422 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 27 Jul 2020 11:43:35 -0500 Subject: [PATCH 11/12] Automatic changelog generation for PR #12900 [ci skip] --- html/changelogs/AutoChangeLog-pr-12900.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12900.yml diff --git a/html/changelogs/AutoChangeLog-pr-12900.yml b/html/changelogs/AutoChangeLog-pr-12900.yml new file mode 100644 index 0000000000..558f0ac753 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12900.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - balance: "oh no, taser buff. alt fire delay dropped to 0.4 seconds." From a4cc3d603029e34885cd6e8dca62914ed8ac39d3 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 27 Jul 2020 11:46:40 -0500 Subject: [PATCH 12/12] Automatic changelog generation for PR #12862 [ci skip] --- html/changelogs/AutoChangeLog-pr-12862.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12862.yml diff --git a/html/changelogs/AutoChangeLog-pr-12862.yml b/html/changelogs/AutoChangeLog-pr-12862.yml new file mode 100644 index 0000000000..82ccd24280 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12862.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscadd: "you can now shoot yourself by disarm-intenting yourself with a gun."