From 699d8e1e88e223684bb50a83ae2882d5ec3b2f34 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 11 Jan 2021 21:06:47 -0800 Subject: [PATCH 1/6] Fixes fermichem EMPs being massive. --- .../code/modules/reagents/chemistry/recipes/fermi.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 21f525088c..18c52171f4 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -93,9 +93,8 @@ e.set_up(round((volume/28)*(pH-9)), T, 0, 0) e.start() - if(!ImpureTot == 0) //If impure, v.small emp (0.6 or less) - ImpureTot *= volume - empulse(T, volume, 1) + if(ImpureTot) //If impure, v.small emp (0.6 or less) + empulse(T, impureTot, 1) my_atom.reagents.clear_reagents() //just in case return From 94d419c6cd9db17b57e65882434b112110312f11 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 20 Jan 2021 14:08:07 -0800 Subject: [PATCH 2/6] Update modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> --- .../code/modules/reagents/chemistry/recipes/fermi.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 18c52171f4..c144fa9196 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -94,7 +94,7 @@ e.start() if(ImpureTot) //If impure, v.small emp (0.6 or less) - empulse(T, impureTot, 1) + empulse(T, ImpureTot, 1) my_atom.reagents.clear_reagents() //just in case return From f2343b32feff382fafca2c0fc23778299340d179 Mon Sep 17 00:00:00 2001 From: Artur Date: Thu, 28 Jan 2021 09:39:21 +0200 Subject: [PATCH 3/6] Brings back turret fixing --- .../machinery/porta_turret/portable_turret.dm | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 29883a073a..ee0a8224a8 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -393,6 +393,27 @@ spark_system.start() //creates some sparks because they look cool qdel(cover) //deletes the cover - no need on keeping it there! +//turret healing +/obj/machinery/porta_turret/examine(mob/user) + . = ..() + if(obj_integrity < max_integrity) + . += "[src] is damaged, use a lit welder to fix it." + +/obj/machinery/porta_turret/welder_act(mob/living/user, obj/item/I) + . = TRUE + if(cover && obj_integrity < max_integrity) + if(!I.tool_start_check(user, amount=0)) + return + user.visible_message("[user] is welding the turret.", \ + "You begin repairing the turret...", \ + "You hear welding.") + if(I.use_tool(src, user, 40, volume=50)) + obj_integrity = max_integrity + user.visible_message("[user.name] has repaired [src].", \ + "You finish repairing the turret.") + else + to_chat(user, "The turret doesn't need repairing.") + /obj/machinery/porta_turret/process() //the main machinery process if(cover == null && anchored) //if it has no cover and is anchored From 5037216f5a1b76e74f644a97e3c96b71010f2543 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 29 Jan 2021 22:16:14 -0700 Subject: [PATCH 4/6] Update eyes.dm --- code/modules/surgery/organs/eyes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index a088eb2e4f..09f0a901a3 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -404,6 +404,7 @@ on_mob.set_light(1, 1, current_color_string) /obj/effect/abstract/eye_lighting + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/obj/item/organ/eyes/robotic/glow/parent /obj/effect/abstract/eye_lighting/Initialize() From 1acebf09ee32d265ecbe4e6017cca487fe6d4a18 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 30 Jan 2021 11:44:23 -0600 Subject: [PATCH 5/6] Automatic changelog generation for PR #14031 [ci skip] --- html/changelogs/AutoChangeLog-pr-14031.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14031.yml diff --git a/html/changelogs/AutoChangeLog-pr-14031.yml b/html/changelogs/AutoChangeLog-pr-14031.yml new file mode 100644 index 0000000000..e50841d0e1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14031.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "fermichem explosion EMPs don't cover the entire station" From d41acaeb96b8d2bfccd1a69dd59e201e54b758c9 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 31 Jan 2021 00:18:10 +0000 Subject: [PATCH 6/6] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-14031.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14031.yml diff --git a/html/changelog.html b/html/changelog.html index 8582b8f0d1..113a82f15d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

31 January 2021

+

Putnam3145 updated:

+
    +
  • fermichem explosion EMPs don't cover the entire station
    • +
+

30 January 2021

timothyteakettle updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 137eba4605..fc8a0f82c2 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -28358,3 +28358,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. zeroisthebiggay: - rscadd: some more FUCKING hairs - imageadd: uncodersprites the advanced extinguisher +2021-01-31: + Putnam3145: + - balance: fermichem explosion EMPs don't cover the entire station diff --git a/html/changelogs/AutoChangeLog-pr-14031.yml b/html/changelogs/AutoChangeLog-pr-14031.yml deleted file mode 100644 index e50841d0e1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14031.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "fermichem explosion EMPs don't cover the entire station"