Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ticket-machine

_maps/map_files/cyberiad/cyberiad.dmm

@@ -4479,7 +4479,7 @@
 "bIg" = (/obj/machinery/door_control{dir = 2; id = "mechbay"; name = "Mech Bay Door Control"; pixel_x = 6; pixel_y = 24; req_access_txt = "29"},/turf/simulated/floor/plasteel{tag = "icon-warningcorner (WEST)"; icon_state = "warningcorner"; dir = 8},/area/assembly/chargebay)
 "bIh" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/assembly/chargebay)
 "bIi" = (/turf/simulated/wall,/area/medical/research{name = "Research Division"})
-"bIj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24; shock_proof = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics)
+"bIj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24; shock_proof = 0},/obj/machinery/light_switch{pixel_x = -23; pixel_y = -10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics)
 "bIk" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/medical/research{name = "Research Division"})
 "bIl" = (/obj/structure/stool/bed/chair/office/light{dir = 1},/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitered"},/area/assembly/robotics)
 "bIm" = (/obj/machinery/camera{c_tag = "Research Robotics Lab"; dir = 2; network = list("Research","SS13")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteredcorner"},/area/assembly/robotics)

code/game/gamemodes/shadowling/shadowling_abilities.dm

@@ -363,7 +363,7 @@
 		var/mob/living/carbon/human/H = target
 		H.visible_message("<span class='warning'>[H]'s skin suddenly bubbles and shifts around their body!</span>", \
 							 "<span class='shadowling'>You regenerate your protective armor and cleanse your form of defects.</span>")
-		H.adjustCloneLoss(target.getCloneLoss())
+		H.adjustCloneLoss(-target.getCloneLoss())
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/shadowling(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/shadowling(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/space/shadowling(H), slot_wear_suit)

code/game/gamemodes/vampire/vampire_powers.dm

@@ -319,6 +319,7 @@
 		return 0
 	if(!affects(C))
 		C.visible_message("<span class='warning'>[C] seems to resist the takeover!</span>", "<span class='notice'>Your faith of [ticker.Bible_deity_name] has kept your mind clear of all evil.</span>")
+		return 0
 	if(!ishuman(C))
 		to_chat(user, "<span class='warning'>You can only enthrall humans!</span>")
 		return 0

code/game/machinery/slotmachine.dm

@@ -47,14 +47,14 @@
 		if(operation == 1) // Play
 			if(working == 1)
 				return
-			if(!account || account.money < 10)
+			if(!account || account.money < 100)
 				return
-			if(!account.charge(10, transaction_purpose = "Bet", dest_name = name))
+			if(!account.charge(100, transaction_purpose = "Bet", dest_name = name))
 				return
 			plays += 1
 			working = 1
 			icon_state = "slots-on"
-			var/roll = rand(1,1350)
+			var/roll = rand(1,20000)
 			playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
 			spawn(25)
 				if(roll == 1)

html/changelog.html

@@ -56,6 +56,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">05 October 2017</h2>
+			<h3 class="author">Birdtalon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Re-adds missing light switch to robotics.</li>
+			</ul>
+
+			<h2 class="date">02 October 2017</h2>
+			<h3 class="author">Imsxz updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Rapid re-hatch no longer kills shadowlings.</li>
+				<li class="bugfix">Vampires can no longer enthrall chaplains</li>
+			</ul>
+
 			<h2 class="date">30 September 2017</h2>
 			<h3 class="author">Jovaniph updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -5501,3 +5501,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Coroner now has their own locker in the morgue.
   Landerlow:
   - rscadd: Adds hydrocodone to the Cyborg Hypospray
+2017-10-02:
+  Imsxz:
+  - bugfix: Rapid re-hatch no longer kills shadowlings.
+  - bugfix: Vampires can no longer enthrall chaplains
+2017-10-05:
+  Birdtalon:
+  - bugfix: Re-adds missing light switch to robotics.