Merge remote-tracking branch 'upstream/master'

code/game/machinery/bots/ed209bot.dm

@@ -52,7 +52,8 @@
 	var/safe_weapons = list(\
 		/obj/item/weapon/gun/energy/laser/bluetag,\
 		/obj/item/weapon/gun/energy/laser/redtag,\
-		/obj/item/weapon/gun/energy/laser/practice)
+		/obj/item/weapon/gun/energy/laser/practice,\
+		/obj/item/weapon/melee/telebaton)
 
 	var/turf/patrol_target	// this is turf to navigate to (location of beacon)
 	var/new_destination		// pending new destination (waiting for beacon response)

code/game/machinery/bots/secbot.dm

@@ -57,7 +57,8 @@
 	var/safe_weapons = list(\
 		/obj/item/weapon/gun/energy/laser/bluetag,\
 		/obj/item/weapon/gun/energy/laser/redtag,\
-		/obj/item/weapon/gun/energy/laser/practice)
+		/obj/item/weapon/gun/energy/laser/practice,\
+		/obj/item/weapon/melee/telebaton)
 
 
 /obj/machinery/bot/secbot/beepsky

code/game/machinery/computer/arcade.dm

@@ -8,7 +8,7 @@
 	var/list/prizes = list(	/obj/item/weapon/storage/box/snappops			= 2,
 							/obj/item/clothing/under/syndicate/tacticool	= 2,
 							/obj/item/toy/blink								= 2,
-							/obj/item/clothing/suit/syndicatefake			= 2,
+							/obj/item/weapon/storage/box/fakesyndiesuit		= 2,
 							/obj/item/toy/sword								= 2,
 							/obj/item/toy/gun								= 2,
 							/obj/item/toy/crossbow							= 2,
@@ -26,7 +26,10 @@
 							/obj/item/toy/prize/mauler						= 1,
 							/obj/item/toy/prize/odysseus					= 1,
 							/obj/item/toy/prize/phazon						= 1,
-							/obj/item/toy/nuke								= 2
+							/obj/item/toy/nuke								= 2,
+							/obj/item/toy/cards/deck						= 2,
+							/obj/item/toy/carpplushie						= 2,
+							/obj/item/toy/minimeteor						= 2,
 							)
 
 /obj/machinery/computer/arcade/power_change()

code/game/objects/items/toys.dm

@@ -378,6 +378,41 @@
 		src.add_fingerprint(user)
 		return
 
+// Copied from /obj/item/weapon/melee/energy/sword/attackby
+/obj/item/toy/sword/attackby(obj/item/weapon/W, mob/living/user)
+	..()
+	if(istype(W, /obj/item/toy/sword))
+		if(W == src)
+			user << "<span class='notice'>You try to attach the end of the plastic sword to... itself. You're not very smart, are you?</span>"
+			if(ishuman(user))
+				user.adjustBrainLoss(10)
+		else
+			user << "<span class='notice'>You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.</span>"
+			new /obj/item/weapon/twohanded/dualsaber/toy(user.loc)
+			del(W)
+			del(src)
+
+/*
+ * Subtype of Double-Bladed Energy Swords
+ */
+/obj/item/weapon/twohanded/dualsaber/toy
+	name = "double-bladed toy sword"
+	desc = "A cheap, plastic replica of TWO energy swords.  Double the fun!"
+	force = 0
+	throwforce = 0
+	throw_speed = 3
+	throw_range = 5
+	force_unwielded = 0
+	force_wielded = 0
+	origin_tech = null
+	attack_verb = list("attacked", "struck", "hit")
+
+/obj/item/weapon/twohanded/dualsaber/toy/IsShield()
+	return 0
+/*
+/obj/item/weapon/twohanded/dualsaber/toy/IsReflect()//Stops Toy Dualsabers from reflecting energy projectiles
+	return 0 */  //uncomment this once reflecting is ported
+
 /obj/item/toy/katana
 	name = "replica katana"
 	desc = "Woefully underpowered in D20."
@@ -1033,3 +1068,35 @@ obj/item/toy/cards/deck/syndicate/black
 	flags = FPRINT | TABLEPASS
 	icon = 'icons/obj/clothing/belts.dmi'
 	slot_flags = SLOT_BELT
+
+/*
+ * Fake meteor
+ */
+
+/obj/item/toy/minimeteor
+	name = "Mini-Meteor"
+	desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor™"
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "minimeteor"
+	flags = FPRINT | TABLEPASS
+	w_class = 2.0
+
+/obj/item/toy/minimeteor/throw_impact(atom/hit_atom)
+	..()
+	playsound(src, 'sound/effects/meteorimpact.ogg', 40, 1)
+	for(var/mob/M in range(10, src))
+		if(!M.stat && !istype(M, /mob/living/silicon/ai))\
+			shake_camera(M, 3, 1)
+	del(src)
+
+/*
+ * Carp plushie
+ */
+
+/obj/item/toy/carpplushie
+	name = "space carp plushie"
+	desc = "An adorable stuffed toy that resembles a space carp."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "carpplushie"
+	w_class = 2.0
+	flags = FPRINT | TABLEPASS

code/game/objects/items/weapons/storage/boxes.dm

@@ -468,6 +468,16 @@
 		new /obj/item/weapon/handcuffs(src)
 		new /obj/item/weapon/handcuffs(src)
 
+/obj/item/weapon/storage/box/fakesyndiesuit
+	name = "boxed space suit and helmet"
+	desc = "A sleek, sturdy box used to hold replica spacesuits."
+	icon_state = "box_of_doom"
+
+	New()
+		..()
+		new /obj/item/clothing/head/syndicatefake(src)
+		new /obj/item/clothing/suit/syndicatefake(src)
+
 /obj/item/weapon/storage/box/mousetraps
 	name = "box of Pest-B-Gon mousetraps"
 	desc = "<B><FONT color='red'>WARNING:</FONT></B> <I>Keep out of reach of children</I>."

code/game/objects/structures/engicart.dm

@@ -100,7 +100,7 @@
 	if(myyellowtoolbox)
 		dat += "<a href='?src=\ref[src];yellowtoolbox=1'>[myyellowtoolbox.name]</a><br>"
 	if(myengitape)
-		dat += "<a href='?src=\ref[src];myengitape=1'>[myengitape.name]</a><br>"
+		dat += "<a href='?src=\ref[src];engitape=1'>[myengitape.name]</a><br>"
 	var/datum/browser/popup = new(user, "engicart", name, 240, 160)
 	popup.set_content(dat)
 	popup.open()

code/modules/clothing/spacesuits/rig.dm

@@ -414,7 +414,7 @@
 	icon_state = "rig0-syndi"
 	item_state = "syndie_helm"
 	_color = "syndi"
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50)
 	siemens_coefficient = 0.6
 	var/obj/machinery/camera/camera
 
@@ -440,7 +440,7 @@
 	item_state = "syndie_hardsuit"
 	slowdown = 1
 	w_class = 3
-	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/device/suit_cooling_unit)
 	siemens_coefficient = 0.6
 	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL