From 723e87effdcd4a45bb4bed778b978b2fd6016f9d Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 20 Jan 2017 21:50:00 -0500 Subject: [PATCH 1/9] Removes Unused Object --- code/game/objects/items/devices/debugger.dm | 44 --------------------- code/game/objects/objs.dm | 2 - paradise.dme | 1 - 3 files changed, 47 deletions(-) delete mode 100644 code/game/objects/items/devices/debugger.dm diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm deleted file mode 100644 index 0984b437155..00000000000 --- a/code/game/objects/items/devices/debugger.dm +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Multitool -- A multitool is used for hacking electronic devices. - * TO-DO -- Using it as a power measurement tool for cables etc. Nannek. - * - */ - -/obj/item/device/debugger - icon = 'icons/obj/hacktool.dmi' - name = "debugger" - desc = "Used to debug electronic equipment." - icon_state = "hacktool-g" - flags = CONDUCT - force = 5.0 - w_class = 2 - throwforce = 5.0 - throw_range = 15 - throw_speed = 3 - desc = "You can use this on airlocks or APCs to try to hack them without cutting wires." - materials = list(MAT_METAL=50, MAT_GLASS=20) - origin_tech = "magnets=1;engineering=1" - var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage - -/obj/item/device/debugger/is_used_on(obj/O, mob/user) - if(istype(O, /obj/machinery/power/apc)) - var/obj/machinery/power/apc/A = O - if(A.emagged || A.malfhack) - to_chat(user, "\red There is a software error with the device.") - else - to_chat(user, "\blue The device's software appears to be fine.") - return 1 - if(istype(O, /obj/machinery/door)) - var/obj/machinery/door/D = O - if(D.operating == -1) - to_chat(user, "\red There is a software error with the device.") - else - to_chat(user, "\blue The device's software appears to be fine.") - return 1 - else if(istype(O, /obj/machinery)) - var/obj/machinery/A = O - if(A.emagged) - to_chat(user, "\red There is a software error with the device.") - else - to_chat(user, "\blue The device's software appears to be fine.") - return 1 \ No newline at end of file diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 9a75e9e3950..24fdc2e43ce 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -61,8 +61,6 @@ nanomanager.close_uis(src) return ..() -/obj/item/proc/is_used_on(obj/O, mob/user) - /obj/proc/process() set waitfor = 0 processing_objects.Remove(src) diff --git a/paradise.dme b/paradise.dme index 93d922f35fc..b450a56e0eb 100644 --- a/paradise.dme +++ b/paradise.dme @@ -710,7 +710,6 @@ #include "code\game\objects\items\devices\autopsy.dm" #include "code\game\objects\items\devices\camera_bug.dm" #include "code\game\objects\items\devices\chameleonproj.dm" -#include "code\game\objects\items\devices\debugger.dm" #include "code\game\objects\items\devices\flash.dm" #include "code\game\objects\items\devices\flashlight.dm" #include "code\game\objects\items\devices\floor_painter.dm" From fe49c3e66ae011856d4ef3901f3fea5ba1de0894 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 20 Jan 2017 21:52:24 -0500 Subject: [PATCH 2/9] icon removal --- icons/obj/hacktool.dmi | Bin 577 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 icons/obj/hacktool.dmi diff --git a/icons/obj/hacktool.dmi b/icons/obj/hacktool.dmi deleted file mode 100644 index fb5be360e0ecb1cc7c9dd2ba8dd1c9bca3ffebdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmV-H0>1r;P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DI+mCyCgq9M~RCwC9|j)C}haRnO2mTn+joLDAY~IrBqqL)z1a& z2mpb@C+85or*!}T0g6dPK~#9!V?1!+0K-TIEDR$Yj0ONDnjIV*{sXfR<3Kr{8uqh{ zRF9J#01KBa|KHHi0Cq%lLOR_8gWC49kZQTSj3mQ{4<8r`3JSnt^b7=A*gskbk`ww9 zCQN{fgJOanseo4YlavBrmj8D^h%o~Bu;fT<0Qda=D!AAL#x{!VAI$>fXgd3OU>z-Z zwY6gcU@fdKeji@+GaSL0Z{Q zQZ2yG!--W66btmI1!!SE$yoqs5yR{S%NbG=A{jPp*uXHMe*!~8V*}l?0JZHWxe$a| z4x&W`ATe^`!Ueh&fYi31&kz)}FE_EVe! z=nbfCKgmsD&={hsf+Uy*6-uDcS5Q!(TT__Y_LJNW`1l32(IF@zPSvwUd P00000NkvXXu0mjflO*nG From 13baacbe5475281a46120777d7c0544472aa01a5 Mon Sep 17 00:00:00 2001 From: scrubmcnoob Date: Sat, 21 Jan 2017 18:28:02 -0500 Subject: [PATCH 3/9] Shadowling Thrall Scaling Shadowlings now have a scaling thrall count for acension dependent on amount of players. Min amount of thralls is limited to 15 as normal. Max amount of thralls is capped to 40. Formula is Players/2.5 Just happens 100 players is exactly 40 thralls. Looking at a balancing standpoint, most can agree right now that shadowlings only needing 15 thralls on 100+ rounds is way too little and prematurely ends the round before things can get really heated up. Also the game mode's minimum playercount is 30, to which it still expects you to convert half the station to thralls, 15. This formula is much less drastic than that but still raises the count. Thanks to Kyet for writing this and explaining the in&outs of the code, and helping me with this. --- code/game/gamemodes/shadowling/shadowling.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 548bf1cf6ad..d2cca5cd1a5 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -97,6 +97,14 @@ Made by Xhuis shadow.special_role = SPECIAL_ROLE_SHADOWLING shadow.restricted_roles = restricted_jobs shadowlings-- + + var/num_players = num_players() + required_thralls = round(num_players / 2.5) + if(required_thralls < 15) + required_thralls = 15 + if(required_thralls > 40) + required_thralls = 40 + ..() return 1 From acfee0a4041a9039d25d67d95a8e14edf1f362d1 Mon Sep 17 00:00:00 2001 From: scrubmcnoob Date: Sat, 21 Jan 2017 21:34:19 -0500 Subject: [PATCH 4/9] Reworks Max Thralls and changes Thrall abilities --- code/game/gamemodes/shadowling/shadowling.dm | 7 ++-- .../shadowling/shadowling_abilities.dm | 39 ++----------------- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index d2cca5cd1a5..00ad8f9c167 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -99,11 +99,11 @@ Made by Xhuis shadowlings-- var/num_players = num_players() - required_thralls = round(num_players / 2.5) + required_thralls = round(num_players / 3) if(required_thralls < 15) required_thralls = 15 - if(required_thralls > 40) - required_thralls = 40 + if(required_thralls > 30) + required_thralls = 30 ..() return 1 @@ -158,7 +158,6 @@ Made by Xhuis update_shadow_icons_added(new_thrall_mind) new_thrall_mind.current.create_attack_log("Became a thrall") new_thrall_mind.current.add_language("Shadowling Hivemind") - new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_glare(null)) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_shadow_walk(null)) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall(null)) to_chat(new_thrall_mind.current, "You see the truth. Reality has been torn away and you realize what a fool you've been.") diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 8c67e8a807d..40253048d57 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -1,4 +1,4 @@ -#define EMPOWERED_THRALL_LIMIT 5 +#define EMPOWERED_THRALL_LIMIT 10 /obj/effect/proc_holder/spell/proc/shadowling_check(var/mob/living/carbon/human/H) if(!H || !istype(H)) return @@ -49,39 +49,6 @@ M.AdjustSilence(10) -/obj/effect/proc_holder/spell/targeted/lesser_glare - name = "Lesser Glare" - desc = "Stuns and mutes a target for a short duration." - panel = "Thrall Abilities" - charge_max = 450 - clothes_req = 0 - action_icon_state = "glare" - -/obj/effect/proc_holder/spell/targeted/lesser_glare/cast(list/targets) - for(var/mob/living/carbon/human/target in targets) - if(!ishuman(target) || !target) - to_chat(usr, "You nay only glare at humans!") - charge_counter = charge_max - return - if(target.stat) - to_chat(usr, "[target] must be conscious!") - charge_counter = charge_max - return - if(is_shadow_or_thrall(target)) - to_chat(usr, "You cannot glare at allies!") - charge_counter = charge_max - return - var/mob/living/carbon/human/M = target - usr.visible_message("[usr]'s eyes flash a blinding red!") - target.visible_message("[target] freezes in place, their eyes glazing over...") - if(in_range(target, usr)) - to_chat(target, "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights...") - else - to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by their heavenly beauty...") - target.Stun(3) //Roughly 30% as long as the normal one - M.AdjustSilence(3) - - /obj/effect/proc_holder/spell/aoe_turf/veil name = "Veil" desc = "Extinguishes most nearby light sources." @@ -672,12 +639,12 @@ sleep(20) thrallToRevive.visible_message("[thrallToRevive] slowly rises, no longer recognizable as human.", \ "You feel new power flow into you. You have been gifted by your masters. You now closely resemble them. You are empowered in \ - darkness but wither slowly in light. In addition, Lesser Glare and Guise have been upgraded into their true forms.") + darkness but wither slowly in light. In addition, you now have glare, veil, and true shadow walk.") thrallToRevive.set_species("Lesser Shadowling") - thrallToRevive.mind.RemoveSpell(/obj/effect/proc_holder/spell/targeted/lesser_glare) thrallToRevive.mind.RemoveSpell(/obj/effect/proc_holder/spell/targeted/lesser_shadow_walk) thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/glare(null)) thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_walk(null)) + thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/veil(null)) if("Revive") if(!is_thrall(thrallToRevive)) to_chat(usr, "[thrallToRevive] is not a thrall.") From 06f9ae70385d1be2dfd7a9b9974fc9cb601cf8f7 Mon Sep 17 00:00:00 2001 From: scrubmcnoob Date: Sun, 22 Jan 2017 00:32:10 -0500 Subject: [PATCH 5/9] Clamp to 25 --- code/game/gamemodes/shadowling/shadowling.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 00ad8f9c167..104026d5719 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -100,10 +100,7 @@ Made by Xhuis var/num_players = num_players() required_thralls = round(num_players / 3) - if(required_thralls < 15) - required_thralls = 15 - if(required_thralls > 30) - required_thralls = 30 + required_thralls = Clamp(required_thralls, 15, 25) ..() return 1 From 9312d831ae532b96be3d0e20305692926c0a1de0 Mon Sep 17 00:00:00 2001 From: scrubmcnoob Date: Mon, 23 Jan 2017 18:07:38 -0500 Subject: [PATCH 6/9] Lesser Slings count back to 5 and lose veil --- code/game/gamemodes/shadowling/shadowling_abilities.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 40253048d57..6c8f13ff317 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -1,4 +1,4 @@ -#define EMPOWERED_THRALL_LIMIT 10 +#define EMPOWERED_THRALL_LIMIT 5 /obj/effect/proc_holder/spell/proc/shadowling_check(var/mob/living/carbon/human/H) if(!H || !istype(H)) return @@ -639,12 +639,11 @@ sleep(20) thrallToRevive.visible_message("[thrallToRevive] slowly rises, no longer recognizable as human.", \ "You feel new power flow into you. You have been gifted by your masters. You now closely resemble them. You are empowered in \ - darkness but wither slowly in light. In addition, you now have glare, veil, and true shadow walk.") + darkness but wither slowly in light. In addition, you now have glare and true shadow walk.") thrallToRevive.set_species("Lesser Shadowling") thrallToRevive.mind.RemoveSpell(/obj/effect/proc_holder/spell/targeted/lesser_shadow_walk) thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/glare(null)) thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_walk(null)) - thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/veil(null)) if("Revive") if(!is_thrall(thrallToRevive)) to_chat(usr, "[thrallToRevive] is not a thrall.") From 409d9ecdae43a66eaa66b871fdf1a96a8693d617 Mon Sep 17 00:00:00 2001 From: scrubmcnoob Date: Tue, 24 Jan 2017 06:53:32 -0500 Subject: [PATCH 7/9] Tweaks --- code/game/gamemodes/shadowling/shadowling.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 104026d5719..528d9396e51 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -98,9 +98,8 @@ Made by Xhuis shadow.restricted_roles = restricted_jobs shadowlings-- - var/num_players = num_players() - required_thralls = round(num_players / 3) - required_thralls = Clamp(required_thralls, 15, 25) + var/thrall_scaling = round(num_players() / 3) + required_thralls = Clamp(thrall_scaling, 15, 25) ..() return 1 From 6ac8fb86018854e00e37e209dd5208097cf12d09 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 25 Jan 2017 01:48:25 -0500 Subject: [PATCH 8/9] Automatic changelog generation for PR #6230 [ci skip] --- html/changelogs/AutoChangeLog-pr-6230.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6230.yml diff --git a/html/changelogs/AutoChangeLog-pr-6230.yml b/html/changelogs/AutoChangeLog-pr-6230.yml new file mode 100644 index 00000000000..f1d3291fb4e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6230.yml @@ -0,0 +1,5 @@ +author: "scrubmcnoob" +delete-after: True +changes: + - tweak: "Shadowling Thrall count now scales to a max of 25." + - tweak: "Shadowling Thralls lose lesser glare" From 8de5e68569f79e392494f5d5335f015bd249ff64 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 25 Jan 2017 02:00:20 -0500 Subject: [PATCH 9/9] Automatic changelog compile, [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-6230.yml | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6230.yml diff --git a/html/changelog.html b/html/changelog.html index d5208203144..1a27683c793 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,13 @@ -->
+

25 January 2017

+

scrubmcnoob updated:

+
    +
  • Shadowling Thrall count now scales to a max of 25.
    • +
  • Shadowling Thralls lose lesser glare
    • +
+

23 January 2017

FalseIncarnate updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index ff8963f47e2..9dd7818e744 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3408,3 +3408,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: NT Enforcer .45 pistol. - rscadd: .45 and 9mm rubber bullets. - imageadd: New shotgun ammo boxes. +2017-01-25: + scrubmcnoob: + - tweak: Shadowling Thrall count now scales to a max of 25. + - tweak: Shadowling Thralls lose lesser glare diff --git a/html/changelogs/AutoChangeLog-pr-6230.yml b/html/changelogs/AutoChangeLog-pr-6230.yml deleted file mode 100644 index f1d3291fb4e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-6230.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "scrubmcnoob" -delete-after: True -changes: - - tweak: "Shadowling Thrall count now scales to a max of 25." - - tweak: "Shadowling Thralls lose lesser glare"