From e93e29e3c0b0c42e408629ebbe435193f3bea59e Mon Sep 17 00:00:00 2001 From: Belsima <31827220+Belsima@users.noreply.github.com> Date: Mon, 11 Sep 2017 19:27:06 -0400 Subject: [PATCH 1/6] Fixes a pair of descriptions. (#3432) --- code/game/machinery/vending_types.dm | 4 ++-- code/game/objects/structures/watercloset.dm | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 59e118252f8..6ce209e35e5 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -273,7 +273,7 @@ /obj/machinery/vending/wallmed1 name = "NanoMed" - desc = "Wall-mounted Medical Equipment dispenser." + desc = "A wall-mounted version of the NanoMed." product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?" icon_state = "wallmed" icon_deny = "wallmed-deny" @@ -293,7 +293,7 @@ /obj/machinery/vending/wallmed2 name = "NanoMed" - desc = "Wall-mounted Medical Equipment dispenser." + desc = "A wall-mounted version of the NanoMed, containing only vital first aid equipment." icon_state = "wallmed" icon_deny = "wallmed-deny" req_access = list(access_medical) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e8d17c2f777..76316a78312 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -506,6 +506,7 @@ /obj/structure/sink/puddle //splishy splashy ^_^ name = "puddle" icon_state = "puddle" + desc = "A small pool of some liquid, ostensibly water." /obj/structure/sink/puddle/attack_hand(mob/M as mob) icon_state = "puddle-splash" From 3b29f295eb88f9a0422662682f81bad358a15a27 Mon Sep 17 00:00:00 2001 From: MarinaGryphon Date: Wed, 13 Sep 2017 11:22:04 -0500 Subject: [PATCH 2/6] Fixes eye color in character setup (#3442) Fixes #3336. --- code/modules/client/preference_setup/general/03_body.dm | 2 +- html/changelogs/mdp-3442.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/mdp-3442.yml diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index b42b76d50cf..d86c027ec1c 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -431,7 +431,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(new_eyes && has_flag(mob_species, HAS_EYE_COLOR) && CanUseTopic(user)) pref.r_eyes = GetRedPart(new_eyes) pref.g_eyes = GetGreenPart(new_eyes) - pref.b_eyes = GetRedPart(new_eyes) + pref.b_eyes = GetBluePart(new_eyes) return TOPIC_REFRESH else if(href_list["skin_tone"]) diff --git a/html/changelogs/mdp-3442.yml b/html/changelogs/mdp-3442.yml new file mode 100644 index 00000000000..0958635fa3f --- /dev/null +++ b/html/changelogs/mdp-3442.yml @@ -0,0 +1,4 @@ +author: MoondancerPony +delete-after: True +changes: + - bugfix: "Made eye color selection work in character setup." From 0aa1e4c6c8e129d79847fe1ff876bbf96eb591d0 Mon Sep 17 00:00:00 2001 From: Lohikar Date: Thu, 14 Sep 2017 13:11:10 -0500 Subject: [PATCH 3/6] Fix space vine lag (#3452) Fixes lag from plants processing forever instead of obeying the subsystem's tick interval. Also fixes a glitch where plants didn't continue to grow if not mature. Fixes #3451. --- code/controllers/subsystems/plants.dm | 8 +++++++- .../hydroponics/spreading/spreading_growth.dm | 13 +++++++------ html/changelogs/lohikar-plantlag.yml | 4 ++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 html/changelogs/lohikar-plantlag.yml diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm index 2ee48773165..354a184d424 100644 --- a/code/controllers/subsystems/plants.dm +++ b/code/controllers/subsystems/plants.dm @@ -15,6 +15,7 @@ var/list/plant_product_sprites = list() // List of all growth sprites plus number of growth stages. var/list/processing = list() + var/list/current = list() /datum/controller/subsystem/plants/New() NEW_SS_GLOBAL(SSplants) @@ -78,7 +79,12 @@ src.plant_product_sprites = SSplants.plant_product_sprites /datum/controller/subsystem/plants/fire(resumed = 0) - var/list/queue = processing + if (!resumed) + var/list/old = current // This should be empty, so might as well just reuse it. + current = processing + processing = old + + var/list/queue = current while (queue.len) var/obj/effect/plant/P = queue[queue.len] queue.len-- diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm index 451d3185344..b10177922ba 100644 --- a/code/modules/hydroponics/spreading/spreading_growth.dm +++ b/code/modules/hydroponics/spreading/spreading_growth.dm @@ -17,7 +17,7 @@ if((locate(/obj/effect/plant) in floor.contents) || (locate(/obj/effect/dead_plant) in floor.contents) ) continue if(floor.density) - if(!isnull(seed.chems["pacid"])) + if(seed.chems["pacid"]) addtimer(CALLBACK(floor, /atom/.proc/ex_act, 3), rand(5, 25)) continue if(!Adjacent(floor) || !floor.Enter(src)) @@ -82,14 +82,15 @@ //spread to 1-3 adjacent turfs depending on yield trait. var/max_spread = between(1, round(seed.get_trait(TRAIT_YIELD)*3/14), 3) - addtimer(CALLBACK(src, .proc/do_spread, spread_chance, max_spread), 1) + do_spread(spread_chance, max_spread) // We shouldn't have spawned if the controller doesn't exist. check_health() - if(neighbors.len || health != max_health || buckled_mob) + if(neighbors.len || health != max_health || buckled_mob || !is_mature()) SSplants.add_plant(src) /obj/effect/plant/proc/do_spread(spread_chance, max_spread) + set waitfor = FALSE for(var/i in 1 to max_spread) if(prob(spread_chance)) sleep(rand(3,5)) @@ -105,8 +106,8 @@ neighbor.neighbors -= target_turf /obj/effect/plant/proc/do_move(turf/target, obj/effect/plant/child) - child.loc = target - child.update_icon() + child.forceMove(target) + child.queue_icon_update() /obj/effect/plant/proc/die_off() // Kill off our plant. @@ -119,6 +120,6 @@ neighbor.neighbors |= check_turf SSplants.add_plant(neighbor) - QDEL_IN(src, 1) + qdel(src) #undef NEIGHBOR_REFRESH_TIME diff --git a/html/changelogs/lohikar-plantlag.yml b/html/changelogs/lohikar-plantlag.yml new file mode 100644 index 00000000000..88260acc869 --- /dev/null +++ b/html/changelogs/lohikar-plantlag.yml @@ -0,0 +1,4 @@ +author: Lohikar +delete-after: True +changes: + - bugfix: "Space vines should no longer create comical amounts of lag." From 00fc0555b74720591d79adaf48ca71afdcdde32d Mon Sep 17 00:00:00 2001 From: Lohikar Date: Thu, 14 Sep 2017 13:12:02 -0500 Subject: [PATCH 4/6] Fix security consoles' light color (#3448) Orange consoles shouldn't really be emitting red light. --- code/game/machinery/computer/prisoner.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- html/changelogs/lohikar-colors.yml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/lohikar-colors.yml diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 268ad8d938b..badbbbd93ab 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/computer.dmi' icon_screen = "explosive" - light_color = "#a91515" + light_color = LIGHT_COLOR_ORANGE req_access = list(access_armory) circuit = /obj/item/weapon/circuitboard/prisoner var/id = 0.0 diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 3a1589860d9..d86e99b427d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -5,7 +5,7 @@ desc = "Used to view, edit and maintain security records" icon_screen = "security" - light_color = "#a91515" + light_color = LIGHT_COLOR_ORANGE req_one_access = list(access_security, access_forensics_lockers, access_lawyer) circuit = /obj/item/weapon/circuitboard/secure_data var/obj/item/weapon/card/id/scan = null diff --git a/html/changelogs/lohikar-colors.yml b/html/changelogs/lohikar-colors.yml new file mode 100644 index 00000000000..700ccc9080b --- /dev/null +++ b/html/changelogs/lohikar-colors.yml @@ -0,0 +1,5 @@ +author: Lohikar +delete-after: True + +changes: + - bugfix: "Orange security consoles have had their red lights swapped out for orange ones. No longer will your orange holoconsole mysteriously glow red." From e3641b76a59a3b8d2ca5b7f58a7353ba692d898a Mon Sep 17 00:00:00 2001 From: Belsima <31827220+Belsima@users.noreply.github.com> Date: Thu, 14 Sep 2017 14:12:48 -0400 Subject: [PATCH 5/6] Fixes APC repair sprites. (#3438) Ported from Paradise - on the right are the new ones. The ones on the left are based on GoonAPCs- I assume you'd rather I fix the APC repair rather than swap to goon APCs --- icons/obj/apc_repair.dmi | Bin 2241 -> 516 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/apc_repair.dmi b/icons/obj/apc_repair.dmi index 60f2650adf30a004455e80191f3c29b8103f802f..df295e2551b355eea2ce8bf49725396068550fd6 100644 GIT binary patch delta 502 zcmVw6q=`9>BoB>qIiu00001bW%=J06^y0W&i*HgL+h0bVOxy zV{&P5bZKvH004NLQ&wLzb5DIX~Gb%xV zFigM&3Ifph!GACXj!+#i1#anOX+V^QPykl%=nPZf(E$Q&ND4e>0s&qHt54mW=_rh* zzzs>kNo*z{D_BWL!A(L6FdQia@wfsGZ%(A sDQ;;gZf-8*o4^V!9zt;`7zIQC04&X$qA{!MJOBUy07*qoM6N<$g5n#&-T(jq literal 2241 zcmV;y2tN0TP)V=-0C=2ri?I%ZFcd}SzOT4}l^6;RE?rEC=>WfA8hO|bSkk`e?>n&Qz;;e@ zPL1nua}(_7=*_vr^n$_p)ROwdSpp3Dj#S|I46;iRFARgqZ;!SjHOE|Fph+#+ue|eb zbYHSx`KVMON!gOXKwp}!Z~kX}^wk(93p+ac0+Y%#rir4b{Qv+5?@2^KRCt{2nq7z; zXBo$TGi%c(sj*x9NF`loQ>ZlcA`1#91=rcLn5Y$+KrYsTWm~~qG++aYdXp}Sc%f!* zR8VMLKZ*epqu5+1^vuv=8|ap8LxNUWJ2_d})s)ceSDH$bI#139wtlr zKzNgx`JH+G|M%mWcP364hTO>E7M(!R@xB2?Cs1^}Z$Qxr6dgCb0Uszjfvn+qUc6Q| ziXx}kxpiTH=Xvp#En9MPb8~Y{O-<3;+uQV-wg&jVpWFF?fq|93kB^Txbw5k2<^IV$ z4j(?;@|sK|Ac`W^(gVZ8!?~H&V*mdAYvQJ-r`ukWYYNQG&9yu~H8sV+zyO}-apJ^@ zJU`twPMtahK&e#9bUbV1GQjgZ0FE9#dd<0H0#Ot(H8r)SgqlS&fom0RBbNbLr$VlZIx%<~iPd30Ku zbMFP(Io|4K-H1+0b1nn2i0YQ`ZQHi3dc4zxxvc>M0|V^ax3BFFbt}R!Y_^$-q4R~g ztpT0x=DHnS9|6~UbbSO|@6l;#UiSucTAJ6r0nk}#UiSucTAJ6b0rpLAs~4VG;)ee& zaKjr=_!RJbpAhh8E3UWokFE(NPDy7*J~kK1mcjl7q8`{tCi}xgHGgeZcg1 z6oYSD3H%LF@DT996lVpdIVb+MZF?Tg* z$6T1G)dl_@!mj|g0q+7mYFDO`3u85yP-_i6N)(JFxWcQzgP6ss7x)WssakR8!T*EK z_s8&Kz^TDOfWC4K2)`?Cr?{7AEABkr&@pjN&2Z<$d0Wdhh=T8=xWY%kuc&pepc2RpyJ!k8+75FSsFbGV>FbNRDF<@b9xdsH!rZ_9`IS4-syd=&MXYY4TT;@mN zZhfDB9=H!U607&rT7fnD=xXb|1ik>_E?_)X8B}Wp-YIU>g|JpP^b}E00=^OFEQ6&| zX;qQUj%SVgT(hvD~Ji0(W87ieBIh@XBn(UBDZf6z7Sf zW;k00ODQh10k)^pZL?!p!>yS_tF=af-=e<_(_Zz$#Q17NPp~FVFmt+D7d=? zmuV5q^KCw_VawHuyWCeEoQCi&;EObtGdm^r=()hwc`NWgM8S689$mjNHbZ++i|FnY z=T$52mA>-eYY_Hx9qa|H!0$Vz_rL9!x%&^z`Km6vphfV-xN**ZFU4KfoIfw_O>vXr z?EQW%u5bfhS9@HE{v;)^qC`(h;GzV+A?}ajj-&)mi#sFkj0~L>cSKy_1}rPldDkR5 zFM$_y{xK!GHzn{6*KoIsJ1v24irXu0XUfp6DXwq>`eXPKX8XDWRs?vlVvr^m zZx1U&bhAUa7@N1nS254{SE&!}Nbk8l*R*y@-0DQZLJqF*5#Yz>G1iOCW327LMVZnI zeAF@9-6g!C+th=eIBJHoBW5ARUDAl@71uA$5m&eYqrk@;v)#RnH}qj8YM<+?z<(10 zcS@k;s8-y|;D1D1kGS*Vtf3ExdtBUWx?kZ2{EkL}2bJiPm_%z5c!vc39V7558U_AH z+%w{)CGg|oo)Y(i)cp!K;2jCPQ;Gf%ljs2&1->AGR~;kp-xAm-?tr*GGzxq^#a-3? zK9Lw{#fAj-064HqiM}d<+m+}&7=at(ReCVNU6H`M#O)BbDQ+~hU)=uz@rqz7X1o~S P00000NkvXXu0mjfQ Date: Thu, 14 Sep 2017 22:58:13 +0300 Subject: [PATCH 6/6] Changelogs, 14SEP2017 --- html/changelog.html | 11 +++++++++++ html/changelogs/.all_changelog.yml | 7 +++++++ html/changelogs/lohikar-colors.yml | 5 ----- html/changelogs/lohikar-plantlag.yml | 4 ---- html/changelogs/mdp-3442.yml | 4 ---- 5 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 html/changelogs/lohikar-colors.yml delete mode 100644 html/changelogs/lohikar-plantlag.yml delete mode 100644 html/changelogs/mdp-3442.yml diff --git a/html/changelog.html b/html/changelog.html index 2818e83f746..8c31c40b1e2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,17 @@ -->
+

14 September 2017

+

Lohikar updated:

+
    +
  • Orange security consoles have had their red lights swapped out for orange ones. No longer will your orange holoconsole mysteriously glow red.
    • +
  • Space vines should no longer create comical amounts of lag.
    • +
+

MoondancerPony updated:

+
    +
  • Made eye color selection work in character setup.
    • +
+

09 September 2017

Ezuo updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b72920ef522..8b2170c6dde 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -4553,3 +4553,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Ezuo: - bugfix: Fixed the long broken Lawgiver code. It will now function as intended, with different firemodes using different charge values. +2017-09-14: + Lohikar: + - bugfix: Orange security consoles have had their red lights swapped out for orange + ones. No longer will your orange holoconsole mysteriously glow red. + - bugfix: Space vines should no longer create comical amounts of lag. + MoondancerPony: + - bugfix: Made eye color selection work in character setup. diff --git a/html/changelogs/lohikar-colors.yml b/html/changelogs/lohikar-colors.yml deleted file mode 100644 index 700ccc9080b..00000000000 --- a/html/changelogs/lohikar-colors.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Lohikar -delete-after: True - -changes: - - bugfix: "Orange security consoles have had their red lights swapped out for orange ones. No longer will your orange holoconsole mysteriously glow red." diff --git a/html/changelogs/lohikar-plantlag.yml b/html/changelogs/lohikar-plantlag.yml deleted file mode 100644 index 88260acc869..00000000000 --- a/html/changelogs/lohikar-plantlag.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Lohikar -delete-after: True -changes: - - bugfix: "Space vines should no longer create comical amounts of lag." diff --git a/html/changelogs/mdp-3442.yml b/html/changelogs/mdp-3442.yml deleted file mode 100644 index 0958635fa3f..00000000000 --- a/html/changelogs/mdp-3442.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: MoondancerPony -delete-after: True -changes: - - bugfix: "Made eye color selection work in character setup."