From c169a0408a251688941f69515a8e64ac5f8750a5 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sun, 26 Sep 2021 13:13:22 -0700 Subject: [PATCH 01/13] more ashwalker lung adjustments --- code/datums/atmosphere/planetary.dm | 6 +++--- code/modules/surgery/organs/lungs.dm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm index a8b77f7394..a2d771af01 100644 --- a/code/datums/atmosphere/planetary.dm +++ b/code/datums/atmosphere/planetary.dm @@ -7,9 +7,9 @@ GAS_N2=10, ) normal_gases = list( - GAS_O2=10, - GAS_N2=10, - GAS_CO2=10, + GAS_O2=5, + GAS_N2=5, + GAS_CO2=5, ) restricted_gases = list( GAS_BZ=0.1, diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index e10b05822b..4cd6728e8a 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -529,8 +529,8 @@ gas_max[GAS_N2] = PP(breath, GAS_N2) + 5 var/o2_pp = PP(breath, GAS_O2) - safe_breath_min = 0.3 * o2_pp - safe_breath_max = 1.3 * o2_pp + safe_breath_min = min(3, 0.3 * o2_pp) + safe_breath_max = max(18, 1.3 * o2_pp + 1) ..() #undef SAFE_THRESHOLD_RATIO From 34936ee5aff671b269c4c40f2ecdf597c71f7a75 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Mon, 18 Oct 2021 03:44:40 -0700 Subject: [PATCH 02/13] Properly implements hysteresis --- .../machinery/components/unary_devices/heat_exchanger.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm index c0dfc5633e..4ad3bbf575 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm @@ -12,6 +12,8 @@ var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null var/update_cycle + var/old_temperature = 0 + var/other_old_temperature = 0 pipe_state = "heunary" @@ -59,9 +61,6 @@ var/other_air_heat_capacity = partner_air_contents.heat_capacity() var/combined_heat_capacity = other_air_heat_capacity + air_heat_capacity - var/old_temperature = air_contents.return_temperature() - var/other_old_temperature = partner_air_contents.return_temperature() - if(combined_heat_capacity > 0) var/combined_energy = partner_air_contents.return_temperature()*other_air_heat_capacity + air_heat_capacity*air_contents.return_temperature() @@ -71,6 +70,8 @@ if(abs(old_temperature-air_contents.return_temperature()) > 1) update_parents() + old_temperature = air_contents.return_temperature() if(abs(other_old_temperature-partner_air_contents.return_temperature()) > 1) partner.update_parents() + other_old_temperature = partner_air_contents.return_temperature() From 6394e2514b62418322b933793815941c2f751470 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 19 Oct 2021 18:53:43 -0500 Subject: [PATCH 03/13] Automatic changelog generation for PR #15282 [ci skip] --- html/changelogs/AutoChangeLog-pr-15282.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15282.yml diff --git a/html/changelogs/AutoChangeLog-pr-15282.yml b/html/changelogs/AutoChangeLog-pr-15282.yml new file mode 100644 index 0000000000..ebbb65c584 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15282.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Properly implemented hysteresis on heat exchanger processing" From 972c90bcad71772d113e1f0694fd1a320365fbdd Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 20 Oct 2021 00:28:21 +0000 Subject: [PATCH 04/13] Automatic changelog compile [ci skip] --- html/changelog.html | 13 +++++++------ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-15281.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15282.yml | 4 ---- 4 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15281.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15282.yml diff --git a/html/changelog.html b/html/changelog.html index e811c87938..59e3911d79 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,13 @@ -->
+

20 October 2021

+

Putnam3145 updated:

+
    +
  • Removed a panic from auxmos
    • +
  • Properly implemented hysteresis on heat exchanger processing
    • +
+

16 October 2021

Ryll/Shaps updated:

    @@ -504,12 +511,6 @@
  • Better Shark Tails, dodododododo~
  • The old ones are now listed as carp tails.
- -

18 August 2021

-

timothyteakettle updated:

-
    -
  • lets you select 4 prosthetic limbs instead of only 2
    • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 71db5b168f..762980dda3 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30147,3 +30147,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. keronshb: - rscadd: Adds the fat dart cigarette and to vendors - imageadd: Adds the sprites for the fat dart +2021-10-20: + Putnam3145: + - bugfix: Removed a panic from auxmos + - bugfix: Properly implemented hysteresis on heat exchanger processing diff --git a/html/changelogs/AutoChangeLog-pr-15281.yml b/html/changelogs/AutoChangeLog-pr-15281.yml deleted file mode 100644 index 10b61f9972..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15281.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Removed a panic from auxmos" diff --git a/html/changelogs/AutoChangeLog-pr-15282.yml b/html/changelogs/AutoChangeLog-pr-15282.yml deleted file mode 100644 index ebbb65c584..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15282.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Properly implemented hysteresis on heat exchanger processing" From 5b8ecf721dd816243ee96a57ab15277169ef7600 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 20 Oct 2021 09:41:35 +0200 Subject: [PATCH 05/13] Adds the base tripoly sprite that was absent. --- icons/obj/barkbox_fluff.dmi | Bin 1378 -> 1394 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/barkbox_fluff.dmi b/icons/obj/barkbox_fluff.dmi index e420e864e782da6aa85ab28ab07f0d281eadfe81..f209ad7c319b87ca4877ccdc25323b74d7cf0aef 100644 GIT binary patch delta 1343 zcmV-F1;F~^3i1k&M1R>q0NJhpgV_Lo4FLa40DoBk|I7e0e*l^P0J9PRvwZ+ZvjEu^ z0I?DP*_Z&ad;nJ207tO^-QC@mmX^T4zyPs)09mn)0I>ksm;i0rt^nD9fPeshW&r=P z05g98fB#tkf6M^?UteDUvyT8rvwZ-w0NJeov5f#$*#Jken12A-d;qb)z`(q+vf-`; zg8%>k0d!JMQvg8b*k%9#0L6M#Sad{Xb7OL8aCB*JZU6vyoRyN%3W6{chOf7$7%;@h{hg2ZsLoBtfX1K-Z(vr~G`a+X{&`T(U-3U*}s?T(TT zE7RB_jwopWuYZjh3vIXo8@;=1`@(<_s69$5RN8h!N@~S#Fy=Wn2v^b3B5f3|QTfFk zY$gM1g@Sl_U;qonQIxWq#}Bp(E$?lNHs3SZS*=i)0B#F@!>;e~!I$qp;H4Cf9xw90 zgwN7E8UE)J>iWsGB5>?s000B3NklpH&1 znE3xcZFf#UB=Ola4c#i;qlkcBa(-mTsjzCL1VIo4p++?Fn*74`uQVX~iof3G{Pnq0 z{q-A|8)Mk7G!(@K6juUrrx({(hx#5tW52-(YDKZ)8!*S0D)s4Fs?T4a6<{h*jun)z z1>^Pe*MH9p+30-;`o^FR!869#E9kw8DaYGb`R?+7U~raD{g5F)(Q%Sc?wKTTe5q1j zrOz3^U<#9~Eae)|xzmg5E9FnIf-TW#@L#YwALmZ>*S94+m!FY`xO9C%5ClOG1VIpl z|C(#Wm){`1{1$md^TGAM>n3u|=Ql0nhR<)?$bT)HAAj&wT>tAp^8?ZZrW5a=^$}?S z(~0-c{)DuF>%>MTR(1Wa6B!aTO-`_DNYJ!6!JZ*O(`E$i>J}Su`gYB)I-Zqa1bk zoJP5O$LBQ4z57cpz;zH`euwz-d!$|?K@bE%5ClOG-j3K(J-;lYIR0i~974I}0r55R zi1_j`!sw0Cremv7RtV*mtA`2lz^~suPJfX{J|EAJu`3@XNqhn-xbpP9E4R#H@*SA~ z(}_BMK4{X}LkE=7xE6z9nsP_9ny!D5~XE)5Bq2`9KRBxt6b;M$O&nYjex zfMBdnQ{@tzFP9rM#AEZz?YG*ZAs*Y`Zol;o4e{9hDftyUFmH&t%BLS_VZGb!pzKEi zqk`Y4n5)xST*xy)y|idfP_HbS6Vz*qE(@XoDrAoMAWn+yr+NC`m8Udll$UdU{fu^*^GyJht7pGVop^YhyM ziXXF0t&nbQJnV5jKfk!(VPo(qr5^O;7Z-H2@9053uivns3wvyE4@c6E=Q!sz8G2?h z?Du)0eZKurUZW%P94u^1F6~ne<$@pxf*`z8{sO`thf8!QXxsn*002ovPDHLkV1j7t BkRt#9 delta 1327 zcmV+~10NH?mfB-Xp0Du2k0DsH?|6gBU07tWZ0J8vA*#Jken12A-d;qb)z`(q+vg#`1 zF8}}l0d!JMQvg8b*k%9#0Kj@wSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP19lwXcr zxfxJ2H7BtW$TZS{L$p9hE6OZRN=+p$#Gs0a4PcmZ!u|&!?%00W;%L_t(|ob8(pZ`v>rhHWnH2Y(+~*L49h#48t(YDBb-p(6p29lC#$)9ni{&u?Fc zhwYV8WEY;$u>wI20fiUa16g}&{QV8pKME?-10^Vhjs;xt*3I~aUM20$0ly}#!NN(-tkB{)=CQ1vLm zkK^TT$_tSsXUqgy)H zvpl{#WrNN~T=@;+%5M=@euuooi(wdsVSgBgVVH9e8(yBb%PfxX4TM8o-iQapl|Lec z-YgqBHX2ohy1WschdJ^<@83NxkVjiSOOp5qRIugQy)8c^uJSHn{sWlBHPTMw=~+&f^!}Zm<$v{)HD94ZlKm@7l4MpHzbMWq5hcFbu;m48t%C^F}EhcdML!tIOL)7SAKf^6|vFylu>}SlCxZ=5L$lt&<;$ zh3shK{)}w%ymj^mi;t;P(2=)}WqeBo>AZcx9S*pI1KHc=`8f=CMWJ1B{3yD-eM$$D lE9aE!a)x0ThGG6w{s2*mkxXx=@)rOA002ovPDHLkV1j3wYq$Ua From 57950045a715da2e6c8f65b736ba95a3b9afc200 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 20 Oct 2021 10:06:14 +0200 Subject: [PATCH 06/13] Fixes the sprites for wielding. --- code/modules/mining/equipment/kinetic_crusher.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 45f1b1d94e..2149967049 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -235,6 +235,9 @@ icon_state = "crusher-bone" item_state = "crusher0-bone" +/obj/item/kinetic_crusher/glaive/bone/update_icon_state() + item_state = "crusher[wielded]-bone" + //destablizing force /obj/item/projectile/destabilizer name = "destabilizing force" From 9ecfb41617f000f887184636f1ad362b9ac01ccb Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 20 Oct 2021 19:49:23 -0500 Subject: [PATCH 07/13] Automatic changelog generation for PR #15209 [ci skip] --- html/changelogs/AutoChangeLog-pr-15209.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15209.yml diff --git a/html/changelogs/AutoChangeLog-pr-15209.yml b/html/changelogs/AutoChangeLog-pr-15209.yml new file mode 100644 index 0000000000..3eabcf9fa7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15209.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Ashwalker lungs more aggressively attempt to be safe on lavaland" From b1fa28528688405a966649d2a71d9214196cf72d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 21 Oct 2021 02:32:51 -0500 Subject: [PATCH 08/13] Automatic changelog generation for PR #15288 [ci skip] --- html/changelogs/AutoChangeLog-pr-15288.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15288.yml diff --git a/html/changelogs/AutoChangeLog-pr-15288.yml b/html/changelogs/AutoChangeLog-pr-15288.yml new file mode 100644 index 0000000000..a3e98974af --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15288.yml @@ -0,0 +1,5 @@ +author: "WanderingFox95" +delete-after: True +changes: + - bugfix: "fixed a runtime in the bark box vendor" + - imageadd: "added a missing tennis ball sprite" From 5392566369ec881d2a46380bbd99edea5286ea02 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 21 Oct 2021 13:19:20 -0500 Subject: [PATCH 09/13] Automatic changelog generation for PR #15289 [ci skip] --- html/changelogs/AutoChangeLog-pr-15289.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15289.yml diff --git a/html/changelogs/AutoChangeLog-pr-15289.yml b/html/changelogs/AutoChangeLog-pr-15289.yml new file mode 100644 index 0000000000..3a70d06f0e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15289.yml @@ -0,0 +1,4 @@ +author: "WanderingFox95" +delete-after: True +changes: + - bugfix: "fixed the wielded sprites not showing up properly." From 50355363117c3b88d46555d1de204fde828f9cea Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Fri, 22 Oct 2021 03:03:59 +0800 Subject: [PATCH 10/13] Clowncar does not ignore airlocks again (#15220) * no airlock tomfoolery * Update clowncar.dm * Update clowncar.dm * assuming direct control fixes inconsistant indentation. * inverted operators Co-authored-by: DeltaFire --- code/modules/vehicles/cars/clowncar.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index c4da65a902..f65df26488 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -90,7 +90,7 @@ playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75) log_combat(src, hittarget_living, "sucked up") return - if(!istype(bumped, /turf/closed)) + if(!istype(bumped, /turf/closed) && !istype(bumped, /obj/machinery/door/airlock/external)) return visible_message(span_warning("[src] rams into [bumped] and crashes!")) playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75) @@ -237,6 +237,11 @@ for(var/mob/busdriver as anything in return_drivers()) busdriver.client.give_award(/datum/award/achievement/misc/the_best_driver, busdriver) +/obj/vehicle/sealed/car/clowncar/driver_move(mob/user, direction) //Prevent it from moving onto space + if(isspaceturf(get_step(src, direction))) + return FALSE + return ..() + /obj/vehicle/sealed/car/clowncar/twitch_plays key_type = null explode_on_death = FALSE From 4c19e8a3d6c6829691112f78ff283ff3fbd5c4d6 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 22 Oct 2021 00:31:30 +0000 Subject: [PATCH 11/13] Automatic changelog compile [ci skip] --- html/changelog.html | 38 +++++++--------------- html/changelogs/.all_changelog.yml | 7 ++++ html/changelogs/AutoChangeLog-pr-15209.yml | 4 --- html/changelogs/AutoChangeLog-pr-15288.yml | 5 --- html/changelogs/AutoChangeLog-pr-15289.yml | 4 --- 5 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15209.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15288.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15289.yml diff --git a/html/changelog.html b/html/changelog.html index 59e3911d79..6f17d663ba 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,18 @@ -->
+

22 October 2021

+

Putnam3145 updated:

+
    +
  • Ashwalker lungs more aggressively attempt to be safe on lavaland
    • +
+

WanderingFox95 updated:

+
    +
  • fixed the wielded sprites not showing up properly.
    • +
  • fixed a runtime in the bark box vendor
    • +
  • added a missing tennis ball sprite
    • +
+

20 October 2021

Putnam3145 updated:

    @@ -485,32 +497,6 @@
    • trillby can't spell pair
    - -

    20 August 2021

    -

    EmeraldSundisk updated:

    -
      -
    • Adds a law office/courtroom to OmegaStation
      • -
    • Adds a gateway to OmegaStation
      • -
    • Adds a pool/maintenance bar to OmegaStation
      • -
    • Removes the original maintenance garden in OmegaStation tweak: Relocates the bathrooms to the starboard hall tweak: Modifies port quarter maintenance to include some affected items
      • -
    -

    Putnam3145 updated:

    -
      -
    • Beach now has showers
      • -
    -

    TripleShades updated:

    -
      -
    • At least four or five space heaters spread across Pubby Station Maints
      • -
    • Missing decal in Pubby Station engineering
      • -
    • Moved an atmos alarm in the SM emitter chamber so it wont be destroyed
      • -
    -

    WanderingFox95 updated:

    -
      -
    • Empty bottles and pitchers are available to the bartender now.
      • -
    • They even come with 10 different fillstates!
      • -
    • Better Shark Tails, dodododododo~
      • -
    • The old ones are now listed as carp tails.
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 762980dda3..04e168ffb5 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30151,3 +30151,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Putnam3145: - bugfix: Removed a panic from auxmos - bugfix: Properly implemented hysteresis on heat exchanger processing +2021-10-22: + Putnam3145: + - bugfix: Ashwalker lungs more aggressively attempt to be safe on lavaland + WanderingFox95: + - bugfix: fixed the wielded sprites not showing up properly. + - bugfix: fixed a runtime in the bark box vendor + - imageadd: added a missing tennis ball sprite diff --git a/html/changelogs/AutoChangeLog-pr-15209.yml b/html/changelogs/AutoChangeLog-pr-15209.yml deleted file mode 100644 index 3eabcf9fa7..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15209.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Ashwalker lungs more aggressively attempt to be safe on lavaland" diff --git a/html/changelogs/AutoChangeLog-pr-15288.yml b/html/changelogs/AutoChangeLog-pr-15288.yml deleted file mode 100644 index a3e98974af..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15288.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "WanderingFox95" -delete-after: True -changes: - - bugfix: "fixed a runtime in the bark box vendor" - - imageadd: "added a missing tennis ball sprite" diff --git a/html/changelogs/AutoChangeLog-pr-15289.yml b/html/changelogs/AutoChangeLog-pr-15289.yml deleted file mode 100644 index 3a70d06f0e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15289.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "WanderingFox95" -delete-after: True -changes: - - bugfix: "fixed the wielded sprites not showing up properly." From 921717d9cd26ce70a1b6bd1e642109932f21e947 Mon Sep 17 00:00:00 2001 From: raspy <47289484+raspy-on-osu@users.noreply.github.com> Date: Fri, 22 Oct 2021 21:58:39 -0400 Subject: [PATCH 12/13] tesla counterplay now accounts for grounding rod capacitor type (#15291) * tesla energy loss accounts for capacitor rating * reverse qdel and energy loss as suggested Co-authored-by: = <=> --- code/modules/power/tesla/energy_ball.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index fc51915b73..5d7bb9a8b6 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -358,8 +358,16 @@ var/obj/singularity/energy_ball/tesla = source if(istype(tesla)) if(istype(closest_atom,/obj/machinery/power/grounding_rod) && tesla.energy>13 && !tesla.contained) - qdel(closest_atom) // each rod deletes two miniballs, - tesla.energy = round(tesla.energy/1.5625) // if there are no miniballs the rod stays and continues to pull the ball in + + // getting the grounding rod's capacitor rating for quick maths + var/obj/machinery/power/grounding_rod/rod = closest_atom + // assuming the rod is fully constructed the second part will always be a capacitor + var/obj/item/stock_parts/capacitor/capacitor = rod.component_parts[2] + + tesla.energy = round(tesla.energy/(1 + 0.28125 * capacitor.rating)) + qdel(closest_atom) // each rod removes tesla energy depending on the power of the capacitor, + // if there are no miniballs the rod stays and continues to pull the ball in + if(prob(20))//I know I know tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets) tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets) From 185b67ad79e4793e612efa1c61609dca5ceaee0f Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 24 Oct 2021 00:28:06 +0000 Subject: [PATCH 13/13] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 6f17d663ba..9e541542b2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -491,12 +491,6 @@
  • i hate the grammarchrist
- -

22 August 2021

-

zeroisthebiggay updated:

-
    -
  • trillby can't spell pair
    • -
GoonStation 13 Development Team