Merge branch 'master' into lavaland_megafauna

code/game/gamemodes/shadowling/shadowling.dm

@@ -97,6 +97,10 @@ Made by Xhuis
 		shadow.special_role = SPECIAL_ROLE_SHADOWLING
 		shadow.restricted_roles = restricted_jobs
 		shadowlings--
+
+	var/thrall_scaling = round(num_players() / 3)
+	required_thralls = Clamp(thrall_scaling, 15, 25)
+
 	..()
 	return 1
 
@@ -150,7 +154,6 @@ Made by Xhuis
 		update_shadow_icons_added(new_thrall_mind)
 		new_thrall_mind.current.create_attack_log("<span class='danger'>Became a thrall</span>")
 		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, "<span class='shadowling'><b>You see the truth. Reality has been torn away and you realize what a fool you've been.</b></span>")

code/game/gamemodes/shadowling/shadowling_abilities.dm

@@ -48,40 +48,6 @@
 		target.Stun(10)
 		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, mob/user = usr)
-	for(var/mob/living/carbon/human/target in targets)
-		if(!ishuman(target) || !target)
-			to_chat(user, "<span class='warning'>You nay only glare at humans!</span>")
-			charge_counter = charge_max
-			return
-		if(target.stat)
-			to_chat(user, "<span class='warning'>[target] must be conscious!</span>")
-			charge_counter = charge_max
-			return
-		if(is_shadow_or_thrall(target))
-			to_chat(user, "<span class='warning'>You cannot glare at allies!</span>")
-			charge_counter = charge_max
-			return
-		var/mob/living/carbon/human/M = target
-		user.visible_message("<span class='warning'><b>[user]'s eyes flash a blinding red!</b></span>")
-		target.visible_message("<span class='danger'>[target] freezes in place, their eyes glazing over...</span>")
-		if(in_range(target, user))
-			to_chat(target, "<span class='userdanger'>Your gaze is forcibly drawn into [user]'s eyes, and you are mesmerized by the heavenly lights...</span>")
-		else
-			to_chat(target, "<span class='userdanger'>Red lights suddenly dance in your vision, and you are mesmerized by their heavenly beauty...</span>")
-		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."
@@ -673,9 +639,8 @@
 				sleep(20)
 				thrallToRevive.visible_message("<span class='warning'>[thrallToRevive] slowly rises, no longer recognizable as human.</span>", \
 											   "<span class='shadowling'><b>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.</b></span>")
+											    darkness but wither slowly in light. In addition, you now have glare and true shadow walk.</b></span>")
 				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))

code/game/objects/items/devices/debugger.dm

@@ -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

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)

html/changelog.html

@@ -55,6 +55,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">25 January 2017</h2>
+			<h3 class="author">scrubmcnoob updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Shadowling Thrall count now scales to a max of 25.</li>
+				<li class="tweak">Shadowling Thralls lose lesser glare</li>
+			</ul>
+
 			<h2 class="date">23 January 2017</h2>
 			<h3 class="author">FalseIncarnate updated:</h3>
 			<ul class="changes bgimages16">

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

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"