Added in most of the code and mapping for syndicate deathsquads, unfo…

…rtunately I can't get the shuttle to work properly so for now the button is commented out.

Added in a new mech for the syndicate deathsquads, it's called the Mauler.
Added in syndicate deathsquad uniforms to the admin equip verb.
Added in the syndicate access level for the syndicate mothership.

Added the syndicate mothership, the nuke team shuttle now spawns inside it, however they cannot get into the mothership. At all. Once I get syndicate deathsquads working they will spawn on the mothership.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1916 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/area/Space Station 13 areas.dm

@@ -180,6 +180,14 @@ proc/process_ghost_teleport_locs()
 	name = "Special Ops Shuttle"
 	icon_state = "shuttlered2"
 
+/area/shuttle/syndicate_elite/mothership
+	name = "Syndicate Elite Shuttle"
+	icon_state = "shuttlered"
+
+/area/shuttle/syndicate_elite/station
+	name = "Syndicate Elite Shuttle"
+	icon_state = "shuttlered2"
+
 /area/shuttle/administration/centcom
 	name = "Administration Shuttle Centcom"
 	icon_state = "shuttlered"
@@ -263,6 +271,21 @@ proc/process_ghost_teleport_locs()
 /area/centcom/holding
 	name = "Holding Facility"
 
+//SYNDICATES
+
+/area/syndicate_mothership
+	name = "Syndicate Mothership"
+	icon_state = "syndie-ship"
+	requires_power = 0
+
+/area/syndicate_mothership/control
+	name = "Syndicate Control Room"
+	icon_state = "syndie-control"
+
+/area/syndicate_mothership/elite_squad
+	name = "Syndicate Elite Squad"
+	icon_state = "syndie-elite"
+
 //EXTRA
 
 /area/asteroid					// -- TLE

code/defines/obj/clothing/gloves.dm

@@ -51,10 +51,11 @@
 	name = "SWAT Gloves"
 	icon_state = "black"
 	item_state = "swat_gl"
-	siemens_coefficient = 0.30
+	siemens_coefficient = 0
+	permeability_coefficient = 0.05
 	protective_temperature = 1100
-	heat_transfer_coefficient = 0.05
-	armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
+	heat_transfer_coefficient = 0.01
+	armor = list(melee = 80, bullet = 60, laser = 50, taser = 30, bomb = 50, bio = 10, rad = 0)
 
 /obj/item/clothing/gloves/combat //Combined effects of SWAT gloves and insulated gloves
 	desc = "These tactical gloves are somewhat fire and impact resistant."

code/defines/obj/clothing/head.dm

@@ -198,6 +198,18 @@
 	desc = "Has a tag: Totally not property of an enemy corporation, honest."
 	armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
 
+/obj/item/clothing/head/helmet/space/syndicate/elite
+	name = "black space helmet"
+	desc = "Professionals Have Standards, Be Polite, Be Efficient, Have a plan to kill everyone you meet."
+	icon_state = "syndicate-helm-black"
+	item_state = "syndicate-helm-black"
+	armor = list(melee = 65, bullet = 55, laser = 35, taser = 20, bomb = 30, bio = 30, rad = 30)
+
+/obj/item/clothing/head/helmet/space/syndicate/elite/leader
+	name = "black space helmet"
+	icon_state = "syndicate-helm-black-red"
+	item_state = "syndicate-helm-black-red"
+
 /obj/item/clothing/head/helmet/space/syndicate/green
 	name = "Green Space Helmet"
 	icon_state = "syndicate-helm-green"

code/defines/obj/clothing/mask.dm

@@ -93,6 +93,11 @@
 	desc = "A close-fitting tactical mask that can filter some environmental toxins or be connected to an air supply."
 	icon_state = "swat"
 
+/obj/item/clothing/mask/gas/syndicate
+	name = "syndicate mask"
+	desc = "A close-fitting tactical mask that can filter some environmental toxins or be connected to an air supply."
+	icon_state = "swat"
+
 /obj/item/clothing/mask/gas/voice
 	name = "gas mask"
 	desc = "A close-fitting mask that can filter some environmental toxins or be connected to an air supply."

code/defines/obj/clothing/shoes.dm

@@ -44,6 +44,7 @@
 	desc = "When you want to turn up the heat."
 	icon_state = "swat"
 	armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
+	flags = NOSLIP
 
 /obj/item/clothing/shoes/combat //Basically SWAT shoes combined with galoshes.
 	name = "combat boots"

code/defines/obj/clothing/suit.dm

@@ -179,10 +179,9 @@
 	protective_temperature = 1000 //If you can't stand the heat, get back to the kitchen - Micro
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-	allowed = list (/obj/item/weapon/kitchenknife)
-	allowed = list (/obj/item/weapon/butch)
+	allowed = list (/obj/item/weapon/kitchenknife,/obj/item/weapon/butch)
 
-/obj/item/clothing/suit/apronchef
+/obj/item/clothing/suit/chef/classic
 	name = "A classic chef's apron."
 	desc = "A basic, dull, white chef's apron."
 	icon_state = "apronchef"
@@ -472,6 +471,20 @@
 	slowdown = 1
 	armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
 
+/obj/item/clothing/suit/space/syndicate/elite
+	name = "black space suit"
+	desc = "A space ready suit with special armor inside designed to allow the wearer to take quite a beating."
+	icon_state = "syndicate-black"
+	item_state = "syndicate-black"
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	slowdown = 1
+	armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
+
+/obj/item/clothing/suit/space/syndicate/elite/leader
+	name = "black space suit"
+	icon_state = "syndicate-black-red"
+	item_state = "syndicate-black-red"
+
 /obj/item/clothing/suit/space/syndicate/green
 	name = "Green Space Suit"
 	icon_state = "syndicate-green"

code/defines/obj/vending.dm

@@ -150,7 +150,7 @@
 	name = "Dinnerware"
 	desc = "A kitchen and restaurant equipment vendor"
 	icon_state = "dinnerware"
-	product_paths = "/obj/item/weapon/tray;/obj/item/weapon/kitchen/utensil/fork;/obj/item/weapon/kitchenknife;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/clothing/suit/apronchef"
+	product_paths = "/obj/item/weapon/tray;/obj/item/weapon/kitchen/utensil/fork;/obj/item/weapon/kitchenknife;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/clothing/suit/chef/classic"
 	product_amounts = "6;4;2;15;2"
 	//product_amounts = "8;5;4" Old totals
 	product_hidden = "/obj/item/weapon/kitchen/utensil/spoon;/obj/item/weapon/kitchen/utensil/knife;/obj/item/weapon/kitchen/rollingpin;/obj/item/weapon/butch"

code/defines/obj/weapon.dm

@@ -501,6 +501,13 @@
 	access = list(access_maint_tunnels)
 	origin_tech = "syndicate=3"
 
+/obj/item/weapon/card/id/syndicate_command
+	name = "Syndicate ID card"
+	desc = "An ID straight from the Syndicate."
+	registered = "Syndicate"
+	assignment = "Syndicate Overlord"
+	access = list(access_syndicate)
+
 /obj/item/weapon/card/id/captains_spare
 	name = "Captain's spare ID"
 	desc = "The spare ID of the High Lord himself."

code/game/jobs/access.dm

@@ -72,6 +72,9 @@
 	access_cent_creed = 108//Creed's office.
 	access_cent_captain = 109//Captain's office/ID comp/AI.
 
+	//The Syndicate
+	access_syndicate = 150//General Syndicate Access
+
 	//MONEY
 	access_crate_cash = 200
 
@@ -248,6 +251,9 @@
 /proc/get_all_centcom_access()
 	return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain)
 
+/proc/get_all_syndicate_access()
+	return list(access_syndicate)
+
 /proc/get_region_accesses(var/code)
 	switch(code)
 		if(0)

code/game/mecha/combat/marauder.dm

@@ -32,6 +32,13 @@
 	force = 55
 	max_equip = 5
 
+/obj/mecha/combat/marauder/mauler
+	desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model."
+	name = "Mauler"
+	icon_state = "mauler"
+	operation_req_access = list(access_syndicate)
+	wreckage = "/obj/decal/mecha_wreckage/mauler"
+
 /obj/mecha/combat/marauder/New()
 	..()
 	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/pulse

code/game/mecha/mecha_wreckage.dm

@@ -95,6 +95,10 @@
 	name = "Marauder wreckage"
 	icon_state = "marauder-broken"
 
+/obj/decal/mecha_wreckage/mauler
+	name = "Mauler Wreckage"
+	icon_state = "mauler-broken"
+	desc = "The syndicate won't be very happy about this..."
 
 /obj/decal/mecha_wreckage/seraph
 	name = "Seraph wreckage"

code/modules/admin/admin_verbs.dm

@@ -165,6 +165,7 @@
 			verbs += /client/proc/only_one  				// muskets
 //			verbs += /client/proc/space_asshole 			// --Agouri :3
 			verbs += /client/proc/strike_team				//N
+//			verbs += /client/proc/syndicate_strike_team     // Commented out until I can find a way to fix the shuttle timing -- Superxpdude
 			verbs += /client/proc/send_space_ninja			//N
 			verbs += /client/proc/spawn_xeno				//N
 			verbs += /proc/possess

code/modules/admin/verbs/debug.dm

@@ -342,7 +342,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 				id = pda.id
 			log_admin("[key_name(src)] has granted [M.key] full access.")
 			id.icon_state = "gold"
-			id:access = get_all_accesses()+get_all_centcom_access()
+			id:access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
 		else
 			alert("Invalid ID card")
 	else
@@ -371,6 +371,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		"masked killer",
 		"assassin",
 		"death commando",
+		"syndicate commando",
 		"centcom official",
 		"centcom commander",
 		"special ops officer",
@@ -565,6 +566,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		if("death commando")//Was looking to add this for a while.
 			M.equip_death_commando()
 
+		if("syndicate commando")
+			M.equip_syndicate_commando()
+
 		if("centcom official")
 			M.equip_if_possible(new /obj/item/clothing/under/rank/centcom_officer(M), M.slot_w_uniform)
 			M.equip_if_possible(new /obj/item/clothing/shoes/black(M), M.slot_shoes)