From 71cbd8a615fe288dca0fdc9ef5898b83505e68c1 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 26 Feb 2021 14:40:00 +0100 Subject: [PATCH 01/22] no more free esword --- code/modules/mining/lavaland/necropolis_chests.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 6af1c2118c..3966e2f771 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1282,8 +1282,8 @@ if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one! chaser_timer = world.time + chaser_cooldown var/obj/effect/temp_visual/hierophant/chaser/C = new(get_turf(user), user, target, chaser_speed, friendly_fire_check) - C.damage = 30 - C.monster_damage_boost = FALSE + C.damage = 15 + C.monster_damage_boost = TRUE log_combat(user, target, "fired a chaser at", src) else INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast @@ -1399,10 +1399,10 @@ new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user) for(var/t in RANGE_TURFS(1, T)) var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies - B.damage = 30 + B.damage = 15 for(var/t in RANGE_TURFS(1, source)) var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies - B.damage = 30 + B.damage = 15 for(var/mob/living/L in range(1, source)) INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along sleep(6) //at this point the blasts detonate @@ -1463,8 +1463,8 @@ if(!J) return var/obj/effect/temp_visual/hierophant/blast/B = new(J, user, friendly_fire_check) - B.damage = 30 - B.monster_damage_boost = FALSE + B.damage = 15 + B.monster_damage_boost = TRUE previousturf = J J = get_step(previousturf, dir) @@ -1476,7 +1476,7 @@ sleep(2) for(var/t in RANGE_TURFS(1, T)) var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check) - B.damage = 15 //keeps monster damage boost due to lower damage + B.damage = 15 //keeps monster damage boost due to lower damage (now added to all damage due to reduction to 15, 30dmg 50AP isn't cool) //Just some minor stuff From d646b7535c46919083c1a524c57a07ad9d0cfdf5 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 10 Mar 2021 22:31:53 +0200 Subject: [PATCH 02/22] Makes vampries dust when they can't pay the blood cost, not before --- .../mob/living/carbon/human/species_types/vampire.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 5e07150ce6..5b415196b8 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -53,10 +53,11 @@ C.adjustOxyLoss(-4) C.adjustCloneLoss(-4) return - C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. - if(C.blood_volume <= (BLOOD_VOLUME_SURVIVE*C.blood_ratio)) - to_chat(C, "You ran out of blood!") - C.dust() + if(C.blood_volume < 0.75) + C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. + else + C.dust(FALSE, TRUE) + var/area/A = get_area(C) if(istype(A, /area/chapel)) to_chat(C, "You don't belong here!") From 0f9754840c9a55fb7ede280f55b50d19ede8fd64 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 10 Mar 2021 23:04:16 +0200 Subject: [PATCH 03/22] wrong way, whoops --- code/modules/mob/living/carbon/human/species_types/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 5b415196b8..136ad1ff1a 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -53,7 +53,7 @@ C.adjustOxyLoss(-4) C.adjustCloneLoss(-4) return - if(C.blood_volume < 0.75) + if(C.blood_volume > 0.75) C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. else C.dust(FALSE, TRUE) From afee43789074dbbab707253a87ceea1e0b47bca5 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 10 Mar 2021 23:18:45 +0200 Subject: [PATCH 04/22] Fixes statpanel spans too --- code/modules/mob/living/carbon/human/species_types/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 136ad1ff1a..9a151118ef 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -126,7 +126,7 @@ . = ..() var/obj/item/organ/heart/vampire/darkheart = getorgan(/obj/item/organ/heart/vampire) if(darkheart) - . += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]." + . += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]." /obj/item/organ/heart/vampire From c8c33207891b3ba23ff6745fd86514747df5d46a Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 14 Mar 2021 15:17:47 -0700 Subject: [PATCH 05/22] Buffed supermatter surge 50x. --- code/modules/events/supermatter_surge.dm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/code/modules/events/supermatter_surge.dm b/code/modules/events/supermatter_surge.dm index d54fc4dcd2..6b0a093440 100644 --- a/code/modules/events/supermatter_surge.dm +++ b/code/modules/events/supermatter_surge.dm @@ -13,11 +13,27 @@ var/power = 2000 /datum/round_event/supermatter_surge/setup() - power = rand(200,4000) + if(prob(70)) + power = rand(200,100000) + else + power = rand(200,200000) /datum/round_event/supermatter_surge/announce() - if(power > 800 || prob(round(power/8))) - priority_announce("Class [round(power/500) + 1] supermatter surge detected. Intervention may be required.", "Anomaly Alert") + var/severity = "" + switch(power) + if(-INFINITY to 100000) + var/low_threat_perc = 100-round(100*((power-200)/(100000-200))) + if(prob(low_threat_perc)) + if(prob(low_threat_perc)) + severity = "low; the supermatter should return to normal operation shortly." + else + severity = "medium; the supermatter should return to normal operation, but check NT CIMS to ensure this." + else + severity = "high; if the supermatter's cooling is not fortified, coolant may need to be added." + if(100000 to INFINITY) + severity = "extreme; emergency action is likely to be required even if coolant loop is fine." + if(power > 20000 || prob(round(power/200))) + priority_announce("Supermatter surge detected. Estimated severity is [severity]", "Anomaly Alert") /datum/round_event/supermatter_surge/start() GLOB.main_supermatter_engine.matter_power += power From 6f6eedb92ca08f2921448c9804b79303073c8e8e Mon Sep 17 00:00:00 2001 From: Artur Date: Tue, 16 Mar 2021 06:47:39 +0200 Subject: [PATCH 06/22] tweaks vampires not to die from bloodloss --- .../mob/living/carbon/human/species_types/vampire.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 9a151118ef..26750ea774 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -3,7 +3,7 @@ id = SPECIES_VAMPIRE default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD,HAS_FLESH,HAS_BONE) - inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH) + inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH,TRAIT_NOMARROW) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutant_bodyparts = list("mcolor" = "FFFFFF", "tail_human" = "None", "ears" = "None", "deco_wings" = "None") exotic_bloodtype = "U" @@ -53,8 +53,8 @@ C.adjustOxyLoss(-4) C.adjustCloneLoss(-4) return - if(C.blood_volume > 0.75) - C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. + if(C.blood_volume > 0.5) + C.blood_volume -= 0.5 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. else C.dust(FALSE, TRUE) From b4969c4770804d14cc8f75d2ec96eb157cda8532 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 12:40:25 -0400 Subject: [PATCH 07/22] Fixes auto-calling for non-heads and adds secure holopads --- _maps/map_files/BoxStation/BoxStation.dmm | 36 ++++++++--------- .../map_files/Deltastation/DeltaStation2.dmm | 32 +++++++-------- _maps/map_files/MetaStation/MetaStation.dmm | 39 +++++++++---------- _maps/map_files/PubbyStation/PubbyStation.dmm | 10 ++--- code/game/machinery/hologram.dm | 6 +-- .../circuitboards/machine_circuitboards.dm | 2 +- 6 files changed, 62 insertions(+), 63 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index eb194cf5cf..d99e42beb7 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1000,7 +1000,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "act" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "acu" = ( @@ -3551,7 +3551,7 @@ /turf/open/floor/plasteel, /area/security/brig) "agU" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agV" = ( @@ -19903,7 +19903,6 @@ /turf/open/floor/plasteel, /area/bridge) "aVk" = ( -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "4-8" }, @@ -19913,6 +19912,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad, /turf/open/floor/plasteel, /area/bridge) "aVl" = ( @@ -22726,10 +22726,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "bcf" = ( -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "bcg" = ( @@ -23322,10 +23322,10 @@ /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/toilet/locker) "bdK" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/bridge/meeting_room) "bdL" = ( @@ -24557,10 +24557,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bgX" = ( @@ -28662,7 +28662,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "bqB" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "bqC" = ( @@ -32045,7 +32045,7 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "byr" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "bys" = ( @@ -32135,13 +32135,13 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "byC" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/brown{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "byD" = ( @@ -35876,13 +35876,13 @@ /turf/open/floor/engine, /area/science/storage) "bGZ" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "bHa" = ( @@ -40809,8 +40809,8 @@ /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bTI" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/tcommsat/computer) "bTJ" = ( @@ -45387,7 +45387,6 @@ name = "Privacy Shutters Control"; pixel_y = 26 }, -/obj/machinery/holopad, /obj/machinery/light{ dir = 1 }, @@ -45401,6 +45400,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "cfI" = ( @@ -49628,12 +49628,12 @@ /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ctJ" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "2-8" }, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ctK" = ( @@ -50018,9 +50018,9 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "cuC" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "cuD" = ( @@ -50075,12 +50075,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cuH" = ( @@ -50106,10 +50106,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "cuJ" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "cuK" = ( @@ -50676,8 +50676,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/hallway) "cvU" = ( @@ -50932,10 +50932,10 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "cwB" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 94699a7a00..6965d3d0af 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -25899,7 +25899,6 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "aVU" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -25907,6 +25906,7 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "aVV" = ( @@ -36419,7 +36419,6 @@ /turf/open/floor/plasteel/dark, /area/aisat) "boh" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -36430,6 +36429,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "boi" = ( @@ -37166,13 +37166,13 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) "bpv" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) "bpw" = ( @@ -46877,7 +46877,6 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "bEg" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -46888,6 +46887,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "bEh" = ( @@ -48308,12 +48308,12 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "bFZ" = ( -/obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bGa" = ( @@ -54052,10 +54052,10 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "2-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOL" = ( @@ -54114,7 +54114,6 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bOR" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "1-4" }, @@ -54123,6 +54122,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bOS" = ( @@ -56069,8 +56069,8 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "bRZ" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bSa" = ( @@ -58451,7 +58451,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/effect/landmark/start/cyborg, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -58463,6 +58462,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bVy" = ( @@ -58795,7 +58795,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -58806,6 +58805,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "bVT" = ( @@ -64575,7 +64575,6 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "ceH" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -64586,6 +64585,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "ceI" = ( @@ -66125,11 +66125,11 @@ /turf/open/floor/plasteel, /area/security/brig) "chd" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/security/brig) "che" = ( @@ -66303,7 +66303,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -66317,6 +66316,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "cho" = ( @@ -67663,10 +67663,10 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cjC" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cjD" = ( @@ -102510,10 +102510,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hor) "drY" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "drZ" = ( @@ -107086,7 +107086,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -107094,6 +107093,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "dAd" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c2a0e5c353..7f8e7c1d8a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3710,7 +3710,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agS" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3721,6 +3720,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agT" = ( @@ -3795,11 +3795,11 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "agZ" = ( -/obj/machinery/holopad, /obj/structure/chair{ dir = 1 }, /obj/effect/landmark/start/head_of_security, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "aha" = ( @@ -9617,8 +9617,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/machinery/holopad, /obj/effect/turf_decal/stripes/line, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/engine/gravity_generator) "arR" = ( @@ -20575,7 +20575,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aOc" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aOd" = ( @@ -21700,7 +21700,7 @@ /area/quartermaster/qm) "aQs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "aQt" = ( @@ -25578,7 +25578,7 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "aYe" = ( @@ -27503,7 +27503,6 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bbv" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -27514,6 +27513,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bbw" = ( @@ -30698,7 +30698,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/holopad, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "bhz" = ( @@ -31161,8 +31160,8 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "bip" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "biq" = ( @@ -33899,12 +33898,12 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bnC" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bnD" = ( @@ -34887,11 +34886,11 @@ /turf/open/floor/plasteel/dark, /area/aisat) "bpF" = ( -/obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "bpG" = ( @@ -34937,8 +34936,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/item/beacon, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "bpL" = ( @@ -37489,9 +37488,9 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "buG" = ( -/obj/machinery/holopad{ - pixel_x = 9; - pixel_y = -9 +/obj/machinery/holopad/secure{ + pixel_x = 15; + pixel_y = -15 }, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) @@ -39670,7 +39669,6 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bzq" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -39681,6 +39679,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bzr" = ( @@ -43456,13 +43455,13 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "bHE" = ( -/obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "bHF" = ( @@ -58787,7 +58786,7 @@ /area/science/explab) "cmX" = ( /obj/structure/window/reinforced, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "cmY" = ( @@ -61251,13 +61250,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/holopad, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "crA" = ( @@ -63638,7 +63637,7 @@ }, /area/crew_quarters/heads/hor) "cvU" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 8e23df2e5f..aef188164e 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -3,9 +3,9 @@ /turf/open/space/basic, /area/space) "aab" = ( -/obj/machinery/holopad, /obj/effect/landmark/start/cyborg, /mob/living/simple_animal/bot/secbot/pingsky, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "aac" = ( @@ -999,7 +999,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/ai_monitored/turret_protected/ai) "acs" = ( @@ -11793,7 +11793,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "aBn" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "aBo" = ( @@ -12592,7 +12592,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aCR" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aCS" = ( @@ -12995,7 +12995,6 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aDM" = ( -/obj/machinery/holopad, /obj/machinery/camera/motion{ c_tag = "AI Upload Center"; dir = 1; @@ -13008,6 +13007,7 @@ name = "Station Intercom (AI Private)"; pixel_y = -28 }, +/obj/machinery/holopad/secure, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aDN" = ( diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 4a576c5a6e..853bd73eac 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -79,7 +79,7 @@ GLOBAL_LIST_EMPTY(network_holopads) var/secure = FALSE /// If we are currently calling another holopad var/calling = FALSE -/* + /obj/machinery/holopad/secure name = "secure holopad" desc = "It's a floor-mounted device for projecting holographic images. This one will refuse to auto-connect incoming calls." @@ -90,7 +90,7 @@ GLOBAL_LIST_EMPTY(network_holopads) var/obj/item/circuitboard/machine/holopad/board = circuit board.secure = TRUE board.build_path = /obj/machinery/holopad/secure -*/ + /obj/machinery/holopad/tutorial resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF flags_1 = NODECONSTRUCT_1 @@ -372,7 +372,7 @@ GLOBAL_LIST_EMPTY(network_holopads) if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2))) HC.Answer(src) break - if(!secure) //HC.head_call && + if(HC.head_call && !secure) HC.Answer(src) break if(outgoing_call) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index dcd0cda233..286506a7d1 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -472,7 +472,7 @@ build_path = /obj/machinery/holopad secure = FALSE else - build_path = /obj/machinery/holopad //secure + build_path = /obj/machinery/holopad/secure //secure secure = TRUE to_chat(user, "You [secure? "en" : "dis"]able the security on the [src]") . = ..() From 508210e3ec2431e88c9a0e84221e4b511d4af6e4 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 13:01:49 -0400 Subject: [PATCH 08/22] buffs particle defender --- modular_citadel/code/modules/projectiles/guns/pumpenergy.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index d7212f61d2..5934cfdc03 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -107,7 +107,7 @@ /obj/item/stock_parts/cell/pumpaction //nice number to achieve the amount of shots wanted name = "pump action particle blaster power supply" - maxcharge = 1200 + maxcharge = 1500 //PUMP ACTION DISABLER @@ -153,7 +153,7 @@ /obj/item/ammo_casing/energy/laser/pump projectile_type = /obj/item/projectile/beam/pump - e_cost = 350 + e_cost = 300 select_name = "kill" pellets = 6 variance = 15 @@ -189,5 +189,5 @@ name = "disabling blast" icon_state = "disablerslug" color = null - stamina = 13 + stamina = 16 range = 6 From 679d00f7871936fcdcec723a886fca0c49da927b Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 13:48:21 -0400 Subject: [PATCH 09/22] rebalances after further testing --- modular_citadel/code/modules/projectiles/guns/pumpenergy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index 5934cfdc03..efd43eb839 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -189,5 +189,5 @@ name = "disabling blast" icon_state = "disablerslug" color = null - stamina = 16 + stamina = 15 range = 6 From 1f668a047326eff918cb5771e41738f6d109c174 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 14:11:50 -0400 Subject: [PATCH 10/22] lowers number of shots back to 8 from 10 --- modular_citadel/code/modules/projectiles/guns/pumpenergy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index efd43eb839..e5b81806e6 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -107,7 +107,7 @@ /obj/item/stock_parts/cell/pumpaction //nice number to achieve the amount of shots wanted name = "pump action particle blaster power supply" - maxcharge = 1500 + maxcharge = 1200 //PUMP ACTION DISABLER From dd44ebae465b6e6132f58cc7cf7fea2864342104 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 17 Mar 2021 16:10:32 -0500 Subject: [PATCH 11/22] peak funny --- code/game/objects/structures/ghost_role_spawners.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index fadf33cb85..b8d14a6555 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -676,7 +676,6 @@ ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT) ADD_TRAIT(new_spawn, TRAIT_EXEMPT_HEALTH_EVENTS, GHOSTROLE_TRAIT) ADD_TRAIT(new_spawn, TRAIT_NO_MIDROUND_ANTAG, GHOSTROLE_TRAIT) //The mob can't be made into a random antag, they are still eligible for ghost roles popups. - ADD_TRAIT(new_spawn, TRAIT_PACIFISM, GHOSTROLE_TRAIT) to_chat(new_spawn,"Ghosting is free!") var/datum/action/toggle_dead_chat_mob/D = new(new_spawn) D.Grant(new_spawn) From 5201cf6ac5a55522bb6012c803e35b7277e6b7d8 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 21:58:41 -0400 Subject: [PATCH 12/22] stops racism --- code/__DEFINES/say.dm | 5 ++++- code/controllers/configuration/configuration.dm | 8 ++++---- code/modules/mob/living/say.dm | 9 +++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 9403eca2da..d04004c659 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -87,12 +87,15 @@ //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam #define MAX_MESSAGE_LEN 4096 //Citadel edit: What's the WORST that could happen? -#define MAX_FLAVOR_LEN 4096 +#define MAX_FLAVOR_LEN 4096 #define MAX_TASTE_LEN 40 //lick... vore... ew... #define MAX_NAME_LEN 42 #define MAX_BROADCAST_LEN 512 #define MAX_CHARTER_LEN 80 +// Is something in the IC chat filter? This is config dependent. +#define CHAT_FILTER_CHECK(T) (config.ic_filter_regex && findtext(T, config.ic_filter_regex)) + // Audio/Visual Flags. Used to determine what sense are required to notice a message. #define MSG_VISUAL (1<<0) #define MSG_AUDIBLE (1<<1) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 32da3b5938..5d7de05598 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -22,7 +22,7 @@ var/motd // var/policy - // var/static/regex/ic_filter_regex + var/static/regex/ic_filter_regex /datum/controller/configuration/proc/admin_reload() if(IsAdminAdvancedProcCall()) @@ -53,7 +53,7 @@ loadmaplist(CONFIG_MAPS_FILE) LoadMOTD() // LoadPolicy() - // LoadChatFilter() + LoadChatFilter() if (Master) Master.OnConfigLoad() @@ -486,7 +486,7 @@ Example config: continue runnable_modes[M] = probabilities[M.config_tag] return runnable_modes -/* + /datum/controller/configuration/proc/LoadChatFilter() var/list/in_character_filter = list() if(!fexists("[directory]/in_character_filter.txt")) @@ -499,7 +499,7 @@ Example config: continue in_character_filter += REGEX_QUOTE(line) ic_filter_regex = in_character_filter.len ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null -*/ + //Message admins when you can. /datum/controller/configuration/proc/DelayedMessageAdmins(text) addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, text), 0) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 9646796802..7ca2234081 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -90,11 +90,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE) var/ic_blocked = FALSE - /* - if(client && !forced && config.ic_filter_regex && findtext(message, config.ic_filter_regex)) + + if(client && !forced && CHAT_FILTER_CHECK(message)) //The filter doesn't act on the sanitized message, but the raw message. ic_blocked = TRUE - */ + if(sanitize) message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)) if(!message || message == "") @@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(ic_blocked) //The filter warning message shows the sanitized message though. to_chat(src, "That message contained a word prohibited in IC chat! Consider reviewing the server rules.\n\"[message]\"") + SSblackbox.record_feedback("tally", "ic_blocked_words", 1, lowertext(config.ic_filter_regex.match)) return var/datum/saymode/saymode = SSradio.saymodes[talk_key] @@ -333,7 +334,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/obj/item/bodypart/rightarm = get_bodypart(BODY_ZONE_R_ARM) if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage) return 0 - + if (get_selected_language() == /datum/language/signlanguage) var/left_disabled = FALSE var/right_disabled = FALSE From cbaad4bde7ac50e1456308c2b5c450312ea661cd Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Thu, 18 Mar 2021 22:39:05 +0800 Subject: [PATCH 13/22] Update generate_documentation.yml --- .github/workflows/generate_documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index c1b7a2d5e1..0fa3f315be 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -20,7 +20,7 @@ jobs: run: | ~/dmdoc touch dmdoc/.nojekyll - echo codedocs.tgstation13.org > dmdoc/CNAME + echo codedocs.citadel-station.net > dmdoc/CNAME - name: Deploy uses: JamesIves/github-pages-deploy-action@3.7.1 with: From 71d55289592605c70f8d9581de5ff24d7cb8a91c Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 18 Mar 2021 21:50:03 +0000 Subject: [PATCH 14/22] fix --- .../mob/living/carbon/human/innate_abilities/blobform.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm index ed3c7e21d4..1aac2fd02e 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm @@ -37,11 +37,11 @@ to_chat(owner, "There's something stuck to your hand, stopping you from transforming!") return if(IsAvailable()) - transforming = TRUE UpdateButtonIcon() var/mutcolor = owner.get_ability_property(INNATE_ABILITY_SLIME_BLOBFORM, PROPERTY_BLOBFORM_COLOR) || ("#" + H.dna.features["mcolor"]) if(!is_puddle) if(CHECK_MOBILITY(H, MOBILITY_USE)) //if we can use items, we can turn into a puddle + transforming = TRUE is_puddle = TRUE //so we know which transformation to use when its used ADD_TRAIT(H, TRAIT_HUMAN_NO_RENDER, SLIMEPUDDLE_TRAIT) owner.cut_overlays() //we dont show our normal sprite, we show a puddle sprite From e4f2e437014807723c5a9d4648e8d526a4c26aa6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:28:10 -0500 Subject: [PATCH 15/22] Automatic changelog generation for PR #14457 [ci skip] --- html/changelogs/AutoChangeLog-pr-14457.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14457.yml diff --git a/html/changelogs/AutoChangeLog-pr-14457.yml b/html/changelogs/AutoChangeLog-pr-14457.yml new file mode 100644 index 0000000000..fce2e15ce2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14457.yml @@ -0,0 +1,5 @@ +author: "GrayRachnid" +delete-after: True +changes: + - bugfix: "fixed the holopad autocall bug" + - bugfix: "properly incorporated the secure holopad that was commented out in the code." From a94f304b523b99592a879828136ac6645b63da46 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:28:28 -0500 Subject: [PATCH 16/22] Automatic changelog generation for PR #14458 [ci skip] --- html/changelogs/AutoChangeLog-pr-14458.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14458.yml diff --git a/html/changelogs/AutoChangeLog-pr-14458.yml b/html/changelogs/AutoChangeLog-pr-14458.yml new file mode 100644 index 0000000000..79810f22e0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14458.yml @@ -0,0 +1,5 @@ +author: "GrayRachnid" +delete-after: True +changes: + - balance: "buffed particle defender disabler shots from 13->15 stamina (15*6=90)" + - balance: "buffed particle defender laser ammo to 4 shots" From 6fa99c22e6569a939f51146d585f146dfc05aa8d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:28:35 -0500 Subject: [PATCH 17/22] Automatic changelog generation for PR #14461 [ci skip] --- html/changelogs/AutoChangeLog-pr-14461.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14461.yml diff --git a/html/changelogs/AutoChangeLog-pr-14461.yml b/html/changelogs/AutoChangeLog-pr-14461.yml new file mode 100644 index 0000000000..29f326d24c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14461.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - rscdel: "removes pacifism from ghost cafe. have fun beating up your coworkers" From f41f69ccfa9e33c615e2f940c6eb1b683db232b1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:28:43 -0500 Subject: [PATCH 18/22] Automatic changelog generation for PR #14464 [ci skip] --- html/changelogs/AutoChangeLog-pr-14464.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14464.yml diff --git a/html/changelogs/AutoChangeLog-pr-14464.yml b/html/changelogs/AutoChangeLog-pr-14464.yml new file mode 100644 index 0000000000..a6f9fe668b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14464.yml @@ -0,0 +1,6 @@ +author: "GrayRachnid" +delete-after: True +changes: + - config: "the in_character_filter.txt is now usable" + - admin: "headmins should edit the in_character_filter.txt" + - server: "someone with box access should delete racism with the in_character_filter.txt" From 1d9f0745076e068dd32a9fd806fe789704ccd5ea Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:29:43 -0500 Subject: [PATCH 19/22] Automatic changelog generation for PR #14436 [ci skip] --- html/changelogs/AutoChangeLog-pr-14436.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14436.yml diff --git a/html/changelogs/AutoChangeLog-pr-14436.yml b/html/changelogs/AutoChangeLog-pr-14436.yml new file mode 100644 index 0000000000..5768d8dc16 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14436.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Buffed supermatter surge massively." From c1e41567624231bc7c96df79a75dbfbb9215e48b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:30:12 -0500 Subject: [PATCH 20/22] Automatic changelog generation for PR #14469 [ci skip] --- html/changelogs/AutoChangeLog-pr-14469.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14469.yml diff --git a/html/changelogs/AutoChangeLog-pr-14469.yml b/html/changelogs/AutoChangeLog-pr-14469.yml new file mode 100644 index 0000000000..71d16a17ee --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14469.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "using the puddle ability when stunned wont break it" From fb340ed36899927062e4bd9e2bc7cd8f1666e071 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:31:17 -0500 Subject: [PATCH 21/22] Automatic changelog generation for PR #14405 [ci skip] --- html/changelogs/AutoChangeLog-pr-14405.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14405.yml diff --git a/html/changelogs/AutoChangeLog-pr-14405.yml b/html/changelogs/AutoChangeLog-pr-14405.yml new file mode 100644 index 0000000000..e7b92bdce5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14405.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - bugfix: "Vampire statpanel no longer shows spans unnecesary" From a970c739603494ad0fd893e1039de2274b62f749 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:32:16 -0500 Subject: [PATCH 22/22] Automatic changelog generation for PR #14323 [ci skip] --- html/changelogs/AutoChangeLog-pr-14323.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14323.yml diff --git a/html/changelogs/AutoChangeLog-pr-14323.yml b/html/changelogs/AutoChangeLog-pr-14323.yml new file mode 100644 index 0000000000..4a1fbcb14b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14323.yml @@ -0,0 +1,4 @@ +author: "dzahlus" +delete-after: True +changes: + - balance: "rebalanced hierophant STAFF to do 15 damage on all attacks"