Merge pull request #669 from ArchieBeepBoop/syndicateleague2

The Syndicate Major League has arrived

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

@@ -1,7 +1,7 @@
 /obj/item/storage/box/syndicate
 
 /obj/item/storage/box/syndicate/PopulateContents()
-	switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1, "stando" = 1)))
+	switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "baseball" = 1, "implant" = 1, "hacker" = 3, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1, "stando" = 1)))
 		if("bloodyspai") // 30 tc now this is more right
 			new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set
 			new /obj/item/clothing/mask/chameleon(src) // Goes with above
@@ -52,7 +52,7 @@
 			new /obj/item/clothing/under/suit_jacket/really_black(src)
 			new /obj/item/screwdriver/power(src) //2 tc item
 
-		if("murder") // 35 tc now
+		if("murder") // 35 tc
 			new /obj/item/melee/transforming/energy/sword/saber(src)
 			new /obj/item/clothing/glasses/thermal/syndi(src)
 			new /obj/item/card/emag(src)
@@ -62,6 +62,17 @@
 			new /obj/item/clothing/glasses/phantomthief/syndicate(src)
 			new /obj/item/reagent_containers/syringe/stimulants(src)
 
+		if("baseball") // 42~ tc
+			new /obj/item/melee/baseball_bat/ablative/syndi(src) //Lets say 12 tc, lesser sleeping carp
+			new /obj/item/clothing/glasses/sunglasses/garb(src) //Lets say 2 tc
+			new /obj/item/card/emag(src) //6 tc
+			new /obj/item/clothing/shoes/sneakers/noslip(src) //2tc
+			new /obj/item/encryptionkey/syndicate(src) //1tc
+			new /obj/item/autosurgeon/anti_drop(src) //Lets just say 7~
+			new /obj/item/clothing/under/syndicate/baseball(src) //3tc
+			new /obj/item/clothing/head/soft/baseball(src) //Lets say 4 tc
+			new /obj/item/reagent_containers/hypospray/medipen/stimulants/baseball(src) //lets say 5tc
+
 		if("implant") // 67+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
 			new /obj/item/implanter/freedom(src)
 			new /obj/item/implanter/uplink/precharged(src)

code/game/objects/items/weaponry.dm

@@ -563,6 +563,12 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 		playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, 1)
 	return 1
 
+/obj/item/melee/baseball_bat/ablative/syndi
+	name = "syndicate major league bat"
+	desc = "A metal bat made by the syndicate for the major league team."
+	force = 18 //Spear damage...
+	throwforce = 30
+
 /obj/item/melee/flyswatter
 	name = "flyswatter"
 	desc = "Useful for killing insects of all sizes."

code/modules/clothing/head/soft_caps.dm

@@ -129,3 +129,14 @@
 	icon_state = "emtsoft"
 	item_color = "emt"
 	dog_fashion = null
+
+/obj/item/clothing/head/soft/baseball
+	name = "baseball cap"
+	desc = "It's a robust baseball hat, this one belongs to syndicate major league team."
+	icon_state = "baseballsoft"
+	item_color = "baseballsoft"
+	item_state = "baseballsoft"
+	flags_inv = HIDEEYES|HIDEFACE
+	armor = list("melee" = 35, "bullet" = 35, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 90)
+	strip_delay = 90 //You dont take a Major Leage cap
+	dog_fashion = null

code/modules/clothing/shoes/miscellaneous.dm

@@ -62,6 +62,16 @@
 	desc = "A pair of orange rubber boots, designed to prevent slipping on wet surfaces while also drying them."
 	icon_state = "galoshes_dry"
 
+/obj/item/clothing/shoes/sneakers/noslip
+	desc = "A pair of black shoes, they have the soles of galoshes making them unable to be slipped on a wet surface."
+	name = "black shoes"
+	icon_state = "black"
+	permeability_coefficient = 0.30
+	clothing_flags = NOSLIP
+	strip_delay = 50
+	equip_delay_other = 50
+	resistance_flags = NONE
+
 /obj/item/clothing/shoes/galoshes/dry/step_action()
 	var/turf/open/t_loc = get_turf(src)
 	SEND_SIGNAL(t_loc, COMSIG_TURF_MAKE_DRY, TURF_WET_WATER, TRUE, INFINITY)

code/modules/clothing/under/syndicate.dm

@@ -70,6 +70,16 @@
 	item_color = "syndicate_combat"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/syndicate/baseball
+	name = "major league, number unknown"
+	desc = "A major league outfit with the number faded number on the back. Seems rather robust for just a game"
+	icon_state = "syndicatebaseball"
+	item_state = "syndicatebaseball"
+	item_color = "syndicatebaseball"
+	has_sensor = NO_SENSORS
+	armor = list("melee" = 15, "bullet" = 5, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
+	mutantrace_variation = NO_MUTANTRACE_VARIATION //Someone needs to sprite the alternate variant for mutants though. But it's better than an error.
+
 /obj/item/clothing/under/syndicate/comfortable
 	name = "Padded Uniform"
 	desc = "A uniform of similar design to the combat uniform, it has had it's armor replaced with extra padding while providing pockets to hold useful gear."

code/modules/surgery/organs/autosurgeon.dm

@@ -99,6 +99,9 @@
 /obj/item/autosurgeon/reviver
 	starting_organ = /obj/item/organ/cyberimp/chest/reviver
 
+/obj/item/autosurgeon/anti_drop
+	starting_organ = /obj/item/organ/cyberimp/brain/anti_drop
+
 /obj/item/autosurgeon/penis
 	desc = "A single use autosurgeon that contains a penis. A screwdriver can be used to remove it, but implants can't be placed back in."
 	uses = 1