From 06d641b46a7a853394b7345371abd819a0cf30ff Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Sat, 14 Mar 2020 21:19:09 +0100
Subject: [PATCH 01/12] Webedit fixing electrocute_act stuns.
---
code/modules/mob/living/carbon/carbon_defense.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 646e41f94c..8bd1a35e07 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -264,11 +264,11 @@
jitteriness += 1000 //High numbers for violent convulsions
do_jitter_animation(jitteriness)
stuttering += 2
- if((!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && (flags & SHOCK_NOSTUN))
+ if((!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && !(flags & SHOCK_NOSTUN))
Stun(40)
spawn(20)
jitteriness = max(jitteriness - 990, 10) //Still jittery, but vastly less
- if((!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && (flags & SHOCK_NOSTUN))
+ if((!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && !(flags & SHOCK_NOSTUN))
DefaultCombatKnockdown(60)
return shock_damage
From e73e1b03eced2ea4f36b0a6b6f7a1932c66e4e84 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 14 Mar 2020 15:14:57 -0700
Subject: [PATCH 02/12] Revert "Stunbaton disarm mode also works on disarm
intent now" (#11446)
---
code/game/objects/items/stunbaton.dm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 3079c3cad9..78ba6d4f5f 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -25,7 +25,7 @@
/obj/item/melee/baton/examine(mob/user)
. = ..()
- . += "Right click attack while in combat mode or attack while in disarm intent to disarm instead of stun."
+ . += "Right click attack while in combat mode to disarm instead of stun."
/obj/item/melee/baton/get_cell()
. = cell
@@ -149,8 +149,6 @@
//return TRUE to interrupt attack chain.
/obj/item/melee/baton/proc/common_baton_melee(mob/M, mob/living/user, disarming = FALSE)
- if(user.a_intent == INTENT_DISARM)
- disarming = TRUE //override if they're in disarm intent.
if(iscyborg(M) || !isliving(M)) //can't baton cyborgs
return FALSE
if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
From d34d46f00da4d76e0fa05ad064db8d3f4b61954c Mon Sep 17 00:00:00 2001
From: Kraseo
Date: Sun, 15 Mar 2020 04:03:50 +0100
Subject: [PATCH 03/12] i think you're a thief cause you stole my heart, stole
my heart, trapped my soul like azura's star (#11461)
---
.../bloodsucker/bloodsucker_objectives.dm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm b/code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm
index a2a0238df1..0c80ce0dee 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm
@@ -43,7 +43,7 @@
// EXPLANATION
/datum/objective/bloodsucker/lair/update_explanation_text()
- explanation_text = "Create a lair by claiming a coffin, and protect it until the end of the shift"// Make sure to keep it safe!"
+ explanation_text = "Create a lair by claiming a coffin, and protect it until the end of the shift."// Make sure to keep it safe!"
// WIN CONDITIONS?
/datum/objective/bloodsucker/lair/check_completion()
@@ -228,7 +228,7 @@
if (SC && SC.lastgen > 0 && SC.connected_panels.len > 0 && SC.connected_tracker)
return FALSE
return TRUE
-*/
+*/
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -250,15 +250,15 @@
// WIN CONDITIONS?
/datum/objective/bloodsucker/heartthief/check_completion()
// -Must have a body.
- if (!owner.current)
+ if(!owner.current)
return FALSE
// Taken from /steal in objective.dm
var/list/all_items = owner.current.GetAllContents() // Includes items inside other items.
var/itemcount = FALSE
for(var/obj/I in all_items) //Check for items
- if(I == /obj/item/organ/heart)
- itemcount ++
- if (itemcount >= target_amount) // Got the right amount?
+ if(istype(I, /obj/item/organ/heart/))
+ itemcount++
+ if(itemcount >= target_amount) // Got the right amount?
return TRUE
return FALSE
From 83b34a053b413637345ab443bf9b84925aed51ed Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 14 Mar 2020 22:03:53 -0500
Subject: [PATCH 04/12] Automatic changelog generation for PR #11461 [ci skip]
---
html/changelogs/AutoChangeLog-pr-11461.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-11461.yml
diff --git a/html/changelogs/AutoChangeLog-pr-11461.yml b/html/changelogs/AutoChangeLog-pr-11461.yml
new file mode 100644
index 0000000000..547a2c58e1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11461.yml
@@ -0,0 +1,4 @@
+author: "Kraseo"
+delete-after: True
+changes:
+ - bugfix: "Bloodsucker heart theft objective now completes successfully."
From 52e20cdadf8471a3d96a02c0e823dc3c130d9ed1 Mon Sep 17 00:00:00 2001
From: Putnam3145
Date: Sat, 14 Mar 2020 20:04:05 -0700
Subject: [PATCH 05/12] Made server votes not subject to the cooldown (#11464)
---
code/controllers/subsystem/vote.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index ac0acfb61d..e7e5754f6b 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -443,7 +443,7 @@ SUBSYSTEM_DEF(vote)
var/admin = FALSE
var/ckey = ckey(initiator_key)
- if(GLOB.admin_datums[ckey])
+ if(GLOB.admin_datums[ckey] || initiator_key == "server")
admin = TRUE
if(next_allowed_time > world.time && !admin)
From b66614635c54cec30f6b2405586764dfe6ec100e Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 14 Mar 2020 22:04:08 -0500
Subject: [PATCH 06/12] Automatic changelog generation for PR #11464 [ci skip]
---
html/changelogs/AutoChangeLog-pr-11464.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-11464.yml
diff --git a/html/changelogs/AutoChangeLog-pr-11464.yml b/html/changelogs/AutoChangeLog-pr-11464.yml
new file mode 100644
index 0000000000..cc59b44a30
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11464.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "Server-run votes aren't subject to vote cooldown"
From bee11a2ee516548e36c76ecef7dff02e13b01b31 Mon Sep 17 00:00:00 2001
From: Kraseo
Date: Sun, 15 Mar 2020 04:04:35 +0100
Subject: [PATCH 07/12] no i am not testing if mice can chew wires if they're
in a stomach now shut the fuck up (#11460)
---
code/modules/mob/living/simple_animal/friendly/mouse.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index c5a4fa6e1e..370442d4c4 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -64,7 +64,7 @@
..()
/mob/living/simple_animal/mouse/handle_automated_action()
- if(isbelly(loc))
+ if(!isturf(loc))
return
if(prob(chew_probability))
@@ -76,7 +76,7 @@
visible_message("[src] chews through the [C]. It's toast!")
playsound(src, 'sound/effects/sparks2.ogg', 100, 1)
C.deconstruct()
- death(toast=1)
+ death(toast=TRUE)
else
C.deconstruct()
visible_message("[src] chews through the [C].")
From fe886fed4700dc486199d7195eb4cb3941c79b16 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 14 Mar 2020 22:04:38 -0500
Subject: [PATCH 08/12] Automatic changelog generation for PR #11460 [ci skip]
---
html/changelogs/AutoChangeLog-pr-11460.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-11460.yml
diff --git a/html/changelogs/AutoChangeLog-pr-11460.yml b/html/changelogs/AutoChangeLog-pr-11460.yml
new file mode 100644
index 0000000000..1c8fb3e3fa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11460.yml
@@ -0,0 +1,4 @@
+author: "Kraseo"
+delete-after: True
+changes:
+ - bugfix: "Mice don't chew on wires anymore while they're on your person."
From bfd001d1652ed4d8420441423c0651f7f9addf92 Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Sun, 15 Mar 2020 11:04:50 +0800
Subject: [PATCH 09/12] quirk fixes (#11466)
---
code/controllers/subsystem/processing/quirks.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index 10655981e5..5aeaf43bab 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -85,7 +85,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
our_quirks -= i
cut += i
pointscut += quirk_points_by_name(i)
- if (pointscut >= 0) //with how it works, it needs to be above zero, not below, as points for positive is positive, and negative is negative, we only want it to break if it's above zero, ie. we cut more positive than negative
+ if (pointscut >= 0)
break
/* //Code to automatically reduce positive quirks until balance is even.
var/points_used = total_points(our_quirks)
@@ -102,7 +102,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
*/
//Nah, let's null all non-neutrals out.
- if (pointscut != 0)// only if the pointscutting didn't work.
+ if (pointscut < 0)// only if the pointscutting didn't work.
if(cut.len)
for(var/i in our_quirks)
if(quirk_points_by_name(i) != 0)
From 59be47b911bb842bd308a8ae70a0a523d887dcce Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 14 Mar 2020 22:04:53 -0500
Subject: [PATCH 10/12] Automatic changelog generation for PR #11466 [ci skip]
---
html/changelogs/AutoChangeLog-pr-11466.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-11466.yml
diff --git a/html/changelogs/AutoChangeLog-pr-11466.yml b/html/changelogs/AutoChangeLog-pr-11466.yml
new file mode 100644
index 0000000000..c5d60c84c2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11466.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - bugfix: "quirk blacklist fixing"
From 23e9ecf97cd7527256de93f78058541669be3998 Mon Sep 17 00:00:00 2001
From: bunny232
Date: Sat, 14 Mar 2020 23:05:04 -0400
Subject: [PATCH 11/12] Update BoxStation.dmm (#11456)
---
_maps/map_files/BoxStation/BoxStation.dmm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 1d57752822..3e569c22f6 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -260,6 +260,11 @@
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
/area/security/prison)
+"aaK" = (
+/obj/structure/table/wood,
+/mob/living/simple_animal/pet/fox/Renault,
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/captain)
"aaN" = (
/obj/structure/chair/sofa/right,
/turf/open/floor/plasteel,
@@ -21528,10 +21533,6 @@
/obj/structure/table,
/turf/open/floor/wood,
/area/bridge/meeting_room)
-"bbZ" = (
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/captain)
"bca" = (
/turf/open/floor/carpet,
/area/bridge/meeting_room)
@@ -90412,7 +90413,7 @@ aYo
aZV
bao
baP
-bbZ
+aaK
bcP
cBo
bgS
From ad46096384825780abd57a862616ef3c4c6e217e Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 14 Mar 2020 22:05:06 -0500
Subject: [PATCH 12/12] Automatic changelog generation for PR #11456 [ci skip]
---
html/changelogs/AutoChangeLog-pr-11456.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-11456.yml
diff --git a/html/changelogs/AutoChangeLog-pr-11456.yml b/html/changelogs/AutoChangeLog-pr-11456.yml
new file mode 100644
index 0000000000..b5a9353d33
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11456.yml
@@ -0,0 +1,4 @@
+author: "bunny232"
+delete-after: True
+changes:
+ - rscadd: "Box station captain office now has a standard issue renault"