Merge branch 'master' of https://github.com/ZomgPonies/Paradise

Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm

code/game/objects/items/weapons/cigs_lighters.dm

@@ -326,6 +326,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		return
 	if(location)
 		location.hotspot_expose(700, 5)
+	if(reagents && reagents.total_volume)	//	check if it has any reagents at all
+		if(iscarbon(loc) && (src == loc:wear_mask)) // if it's in the human/monkey mouth, transfer reagents to the mob
+			if(istype(loc, /mob/living/carbon/human))
+				var/mob/living/carbon/human/H = loc
+				if(H.species.flags & IS_SYNTHETIC)
+					return
+			var/mob/living/carbon/C = loc
+			if(prob(15)) // so it's not an instarape in case of acid
+				reagents.reaction(C, INGEST)
+			reagents.trans_to(C, REAGENTS_METABOLISM)
+		else // else just remove some of the reagents
+			reagents.remove_any(REAGENTS_METABOLISM)
 	return
 
 /obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user as mob) //Refills the pipe. Can be changed to an attackby later, if loose tobacco is added to vendors or something.

code/game/objects/items/weapons/dna_injector.dm

@@ -267,6 +267,11 @@
 		block = TELEBLOCK
 		..()
 
+/obj/item/weapon/dnainjector/telemut/darkbundle
+	name = "DNA injector"
+	desc = "Good. Let the hate flow through you."
+
+
 /obj/item/weapon/dnainjector/antitele
 	name = "DNA-Injector (Anti-Tele.)"
 	desc = "Will make you not able to control your mind."

code/game/objects/items/weapons/implants/implant.dm

@@ -567,3 +567,28 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	name = "cortical stack"
 	desc = "A fist-sized mass of biocircuits and chips."
 	icon_state = "implant_evil"
+
+
+/obj/item/weapon/implant/emp
+	name = "emp implant"
+	desc = "Triggers an EMP."
+
+	var/activation_emote = "chuckle"
+	var/uses = 2
+
+/obj/item/weapon/implant/emp/New()
+	activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "smile", "pale", "sniff", "whimper", "wink")
+	..()
+	return
+
+/obj/item/weapon/implant/emp/trigger(emote, mob/living/carbon/source as mob)
+	if (src.uses < 1)	return 0
+	if (emote == src.activation_emote)
+		src.uses--
+		empulse(source, 3, 5)
+	return
+
+/obj/item/weapon/implant/emp/implanted(mob/living/carbon/source)
+		source.mind.store_memory("EMP implant can be activated [uses] time\s by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
+		source << "The implanted EMP implant can be activated [uses] time\s by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
+		return 1

code/game/objects/items/weapons/implants/implanter.dm

@@ -170,3 +170,12 @@
 		..()
 		update()
 		return
+
+/obj/item/weapon/implanter/emp
+	name = "implanter-EMP"
+
+	New()
+		src.imp = new /obj/item/weapon/implant/emp(src)
+		..()
+		update()
+		return

code/game/objects/items/weapons/shields.dm

@@ -39,7 +39,7 @@
 
 /obj/item/weapon/shield/energy
 	name = "energy combat shield"
-	desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
+	desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "eshield0" // eshield1 for expanded
 	flags = FPRINT | TABLEPASS| CONDUCT

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

@@ -206,3 +206,89 @@
 	..()
 	new /obj/item/stack/tile/plasteel(src)
 	new /obj/item/weapon/crowbar(src)
+
+/*
+ * Duffelbags - My thanks to MrSnapWalk for the original icon and Neinhaus for the job variants - Dave.
+ */
+
+ /obj/item/weapon/storage/backpack/duffel
+	name = "duffelbag"
+	desc = "A large grey duffelbag designed to hold more items than a regular bag."
+	icon_override = 'icons/mob/in-hand/duffelbag.dmi'
+	icon_state = "duffel"
+	item_state = "duffel"
+	storage_slots = 10 // Duffelbags can hold more items.
+	max_combined_w_class = 25
+
+/obj/item/weapon/storage/backpack/duffel/syndimed
+	name = "suspicious duffelbag"
+	desc = "A black and red duffelbag with a red and white cross sewn onto it."
+	icon_state = "duffel-syndimed"
+	item_state = "duffel-syndimed"
+
+/obj/item/weapon/storage/backpack/duffel/syndiammo
+	name = "suspicious duffelbag"
+	desc = "A black and red duffelbag with a patch depicting shotgun shells sewn onto it."
+	icon_state = "duffel-syndiammo"
+	item_state = "duffel-syndiammo"
+
+/obj/item/weapon/storage/backpack/duffel/captain
+	name = "captain's duffelbag"
+	desc = "A duffelbag designed to hold large quantities of condoms."
+	icon_state = "duffel-captain"
+	item_state = "duffel-captain"
+
+
+/obj/item/weapon/storage/backpack/duffel/security
+	name = "security duffelbag"
+	desc = "A duffelbag built with robust fabric!"
+	icon_state = "duffel-security"
+	item_state = "duffel-security"
+
+/obj/item/weapon/storage/backpack/duffel/virology
+	name = "virology duffelbag"
+	desc = "A white duffelbag designed to contain biohazards."
+	icon_state = "duffel-viro"
+	item_state = "duffel-viro"
+
+/obj/item/weapon/storage/backpack/duffel/science
+	name = "scientist duffelbag"
+	desc = "A duffelbag designed to hold the secrets of space."
+	icon_state = "duffel-toxins"
+	item_state = "duffel-toxins"
+
+/obj/item/weapon/storage/backpack/duffel/genetics
+	name = "scientist duffelbag"
+	desc = "A duffelbag designed to hold gibbering monkies."
+	icon_state = "duffel-toxins"
+	item_state = "duffel-toxins"
+
+/obj/item/weapon/storage/backpack/duffel/chemistry
+	name = "scientist duffelbag"
+	desc = "A duffelbag designed to hold corrosive substances."
+	icon_state = "duffel-chemistry"
+	item_state = "duffel-chemistry"
+
+/obj/item/weapon/storage/backpack/duffel/medical
+	name = "medical duffelbag"
+	desc = "A duffelbag designed to hold medicine."
+	icon_state = "duffel-med"
+	item_state = "duffel-med"
+
+/obj/item/weapon/storage/backpack/duffel/engineering
+	name = "industrial duffelbag"
+	desc = "A duffelbag designed to hold tools."
+	icon_state = "duffel-eng"
+	item_state = "duffel-eng"
+
+/obj/item/weapon/storage/backpack/duffel/hydro
+	name = "hydroponics duffelbag"
+	desc = "A duffelbag designed to hold seeds and fauna."
+	icon_state = "duffel-hydro"
+	item_state = "duffel-hydro"
+
+/obj/item/weapon/storage/backpack/duffel/clown
+	name = "smiles von wiggleton"
+	desc = "A duffelbag designed to hold bananas and bike horns."
+	icon_state = "duffel-clown"
+	item_state = "duffel-clown"

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

@@ -214,6 +214,17 @@
 	var/new_name = pick("evil", "suspicious", "ominous", "donk-flavored", "robust", "sneaky")
 	name = "[new_name] cigarette packet"
 
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate
+	name = "cigarette packet"
+	desc = "An obscure brand of cigarettes."
+	icon_state = "syndiepacket"
+	item_state = "syndiepacket"
+
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate/New()
+	..()
+	for(var/i = 1 to storage_slots)
+		reagents.add_reagent("doctorsdelight",15)
+
 /*
  * Vial Box
  */

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

@@ -1,11 +1,12 @@
 /obj/item/weapon/storage/box/syndicate/
 	New()
 		..()
-		switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1, "smoothoperator" = 1)))
+		switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "bond" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "implant" = 1, "hacker" = 1, "lordsingulo" = 1, "darklord" = 1)))
 			if("bloodyspai")
 				new /obj/item/clothing/under/chameleon(src)
 				new /obj/item/clothing/mask/gas/voice(src)
 				new /obj/item/weapon/card/id/syndicate(src)
+				new /obj/item/weapon/card/id/syndicate(src)
 				new /obj/item/clothing/shoes/syndigaloshes(src)
 				return
 
@@ -15,12 +16,20 @@
 				new /obj/item/device/chameleon(src)
 				return
 
+			if("bond")
+				new /obj/item/weapon/gun/projectile/automatic/pistol(src)
+				new /obj/item/weapon/silencer(src)
+				new /obj/item/ammo_box/magazine/m10mm(src)
+				new /obj/item/ammo_box/magazine/m10mm(src)
+				new /obj/item/clothing/under/chameleon(src)
+				new /obj/item/weapon/card/id/syndicate(src)
+
 			if("screwed")
-				new /obj/effect/spawner/newbomb/timer/syndicate(src)
-				new /obj/effect/spawner/newbomb/timer/syndicate(src)
+				new /obj/item/device/radio/beacon/syndicate/bomb(src)
+				new /obj/item/weapon/grenade/syndieminibomb(src)
 				new /obj/item/device/powersink(src)
-				new /obj/item/clothing/suit/space/syndicate(src)
-				new /obj/item/clothing/head/helmet/space/syndicate(src)
+				new /obj/item/clothing/suit/space/syndicate/black/red(src)
+				new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
 				return
 
 			if("guns")
@@ -37,11 +46,18 @@
 				new /obj/item/clothing/shoes/syndigaloshes(src)
 				return
 
-			if("freedom")
+			if("implant")
 				var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
 				O.imp = new /obj/item/weapon/implant/freedom(O)
 				var/obj/item/weapon/implanter/U = new /obj/item/weapon/implanter(src)
 				U.imp = new /obj/item/weapon/implant/uplink(U)
+				var/obj/item/weapon/implanter/C = new /obj/item/weapon/implanter(src)
+				C.imp = new /obj/item/weapon/implant/emp(C)
+				var/obj/item/weapon/implanter/K = new /obj/item/weapon/implanter(src)
+				K.imp = new /obj/item/weapon/implant/adrenalin(K)
+				var/obj/item/weapon/implanter/S = new /obj/item/weapon/implanter(src)
+				S.imp = new /obj/item/weapon/implant/explosive(S)
+				S.name += " (explosive)"
 				return
 
 			if("hacker")
@@ -52,19 +68,18 @@
 
 			if("lordsingulo")
 				new /obj/item/device/radio/beacon/syndicate(src)
-				new /obj/item/clothing/suit/space/syndicate(src)
-				new /obj/item/clothing/head/helmet/space/syndicate(src)
+				new /obj/item/clothing/suit/space/syndicate/black/red(src)
+				new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
 				new /obj/item/weapon/card/emag(src)
 				return
 
-			if("smoothoperator")
-				new /obj/item/weapon/gun/projectile/automatic/pistol(src)
-				new /obj/item/weapon/silencer(src)
-				new /obj/item/weapon/soap/syndie(src)
-				new /obj/item/weapon/storage/bag/trash(src)
-				new /obj/item/bodybag(src)
-				new /obj/item/clothing/under/suit_jacket(src)
-				new /obj/item/clothing/shoes/laceup(src)
+			if("darklord")
+				new /obj/item/weapon/melee/energy/sword(src)
+				new /obj/item/weapon/melee/energy/sword(src)
+				new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
+				new /obj/item/clothing/head/chaplain_hood(src)
+				new /obj/item/clothing/suit/chaplain_hoodie(src)
+				new /obj/item/weapon/card/id/syndicate(src)
 				return
 
 /obj/item/weapon/storage/box/syndie_kit
@@ -165,4 +180,14 @@
 		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
 		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
 		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
-		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
+		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
+
+/obj/item/weapon/storage/box/syndie_kit/emp
+	name = "boxed EMP kit"
+
+	New()
+		..()
+		new /obj/item/weapon/grenade/empgrenade(src)
+		new /obj/item/weapon/grenade/empgrenade(src)
+		new /obj/item/weapon/implanter/emp/(src)
+		new /obj/item/device/flashlight/emp/(src)

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -235,7 +235,7 @@
 		return
 	else
 		return ..()
-		
+
 /*
  *Energy Blade
  */
@@ -301,7 +301,7 @@
 	active = !active
 	if (active)
 		force = 10
-		reflect_chance = 80
+		reflect_chance = 100
 		icon_state = "eshield[active]"
 		w_class = 4
 		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)

code/game/objects/items/weapons/twohanded.dm

@@ -219,7 +219,7 @@ obj/item/weapon/twohanded/
 /obj/item/weapon/twohanded/dualsaber/update_icon()
 	if(wielded)
 		icon_state = "dualsaber[blade_color][wielded]"
-		reflect_chance = 80
+		reflect_chance = 100
 	else
 		icon_state = "dualsaber0"
 		reflect_chance = 0