Merge pull request #139 from SamCroswell/master

Additional Select Equiptment Option, More Areas

baystation12.dme

@@ -603,6 +603,7 @@
 #include "code\game\objects\items\weapons\grenades\grenade.dm"
 #include "code\game\objects\items\weapons\grenades\smokebomb.dm"
 #include "code\game\objects\items\weapons\grenades\spawnergrenade.dm"
+#include "code\game\objects\items\weapons\implants\augmentation.dm"
 #include "code\game\objects\items\weapons\implants\deadman.dm"
 #include "code\game\objects\items\weapons\implants\implant.dm"
 #include "code\game\objects\items\weapons\implants\implantcase.dm"

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

@@ -526,11 +526,18 @@ proc/process_ghost_teleport_locs()
 	icon_state = "yellow"
 	requires_power = 0
 
-/area/ninja_outpost
-	name = "\improper SpiderClan Outpost"
+/area/ninja
+	name = "\improper Ninja Area Parent"
 	icon_state = "ninjabase"
 	requires_power = 0
 
+/area/ninja/outpost
+	name = "\improper SpiderClan Outpost"
+
+/area/ninja/holding
+	name = "\improper SpiderClan Holding Facility"
+
+
 /area/vox_station/transit
 	name = "\improper hyperspace"
 	icon_state = "shuttle"
@@ -881,6 +888,14 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Messaging Server Room"
 	icon_state = "server"
 
+/area/ntrep
+	name = "\improper NanoTrasen Rep Office"
+	icon_state = "bluenew"
+
+/area/blueshield
+	name = "\improper Blueshield's Office"
+	icon_state = "blueold"
+
 //Crew
 
 /area/crew_quarters

code/game/gamemodes/newobjective.dm

@@ -1415,7 +1415,7 @@ datum
 
 			check_completion()//Basically runs through all the mobs in the area to determine how much they are worth.
 				var/captured_amount = 0
-				var/area/centcom/holding/A = locate()
+				var/area/ninja/holding/A = locate()
 				for(var/mob/living/carbon/human/M in A)//Humans.
 					if(M.stat==2)//Dead folks are worth less.
 						captured_amount+=0.5

code/game/gamemodes/objective.dm

@@ -566,7 +566,7 @@ datum/objective/capture
 
 	check_completion()//Basically runs through all the mobs in the area to determine how much they are worth.
 		var/captured_amount = 0
-		var/area/centcom/holding/A = locate()
+		var/area/ninja/holding/A = locate()
 		for(var/mob/living/carbon/human/M in A)//Humans.
 			if(M.stat==2)//Dead folks are worth less.
 				captured_amount+=0.5

code/game/objects/items/devices/PDA/PDA.dm

@@ -136,13 +136,13 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/syndicate
 	default_cartridge = /obj/item/weapon/cartridge/syndicate
-	icon_state = "pda-syn"
+	icon_state = "pda-syndi"
 	name = "Military PDA"
 	owner = "John Doe"
 	hidden = 1
 
 /obj/item/device/pda/chaplain
-	icon_state = "pda-holy"
+	icon_state = "pda-chaplain"
 	ttone = "holy"
 
 /obj/item/device/pda/lawyer
@@ -158,7 +158,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon_state = "pda-robot"
 
 /obj/item/device/pda/librarian
-	icon_state = "pda-libb"
+	icon_state = "pda-library"
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader."
 	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
 	silent = 1 //Quiet in the library!
@@ -172,19 +172,19 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon_state = "pda-chef"
 
 /obj/item/device/pda/bar
-	icon_state = "pda-bar"
+	icon_state = "pda-bartender"
 
 /obj/item/device/pda/atmos
 	default_cartridge = /obj/item/weapon/cartridge/atmos
-	icon_state = "pda-atmo"
+	icon_state = "pda-atmos"
 
 /obj/item/device/pda/chemist
 	default_cartridge = /obj/item/weapon/cartridge/chemistry
-	icon_state = "pda-chem"
+	icon_state = "pda-chemistry"
 
 /obj/item/device/pda/geneticist
 	default_cartridge = /obj/item/weapon/cartridge/medical
-	icon_state = "pda-gene"
+	icon_state = "pda-genetics"
 
 
 // Special AI/pAI PDAs that cannot explode.

code/modules/admin/verbs/debug.dm

@@ -555,6 +555,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		"death commando",
 		"syndicate commando",
 		"special ops officer",
+		"special ops formal",
 		"blue wizard",
 		"red wizard",
 		"marisa wizard",
@@ -879,14 +880,24 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/swat/officer(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
-			M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear)
+			M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses)
-			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt)
-			M.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(M), slot_r_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 
+			var/obj/item/device/pda/heads/pda = new(M)
+			pda.owner = M.real_name
+			pda.ownjob = "Special Operations Officer"
+			pda.icon_state = "pda-syndi"
+			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
+			pda.desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition designed for military field work."
+			pda.default_cartridge = /obj/item/weapon/cartridge/captain
+
+			M.equip_if_possible(pda, slot_wear_pda)
+
 			var/obj/item/weapon/card/id/W = new(M)
 			W.name = "[M.real_name]'s ID Card"
 			W.icon_state = "centcom"
@@ -896,6 +907,39 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.registered_name = M.real_name
 			M.equip_to_slot_or_del(W, slot_wear_id)
 
+		if("special ops formal")
+			M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/captain(M), slot_w_uniform)
+			M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_l_ear)
+			M.equip_if_possible(new /obj/item/clothing/gloves/white(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
+
+			var/obj/item/device/pda/heads/pda = new(M)
+			pda.owner = M.real_name
+			pda.ownjob = "Special Operations Officer"
+			pda.icon_state = "pda-syndi"
+			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
+			pda.desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition designed for military field work."
+			pda.default_cartridge = /obj/item/weapon/cartridge/captain
+
+			M.equip_if_possible(pda, slot_wear_pda)
+
+			M.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(M), slot_l_store)
+			M.equip_if_possible(new /obj/item/weapon/melee/telebaton(M), slot_r_store)
+
+			var/obj/item/weapon/card/id/W = new(M)
+			W.name = "[M.real_name]'s ID Card"
+			W.icon_state = "centcom"
+			W.access = get_all_accesses()
+			W.access += get_all_centcom_access()
+			W.assignment = "Special Operations Officer"
+			W.registered_name = M.real_name
+			M.equip_to_slot_or_del(W, slot_wear_id)
+
+
+
 		if("blue wizard")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit)

code/modules/clothing/spacesuits/ninja.dm

@@ -6,6 +6,7 @@
 	allowed = list(/obj/item/weapon/cell)
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25)
 	siemens_coefficient = 0.2
+	loose = 0
 
 
 /obj/item/clothing/suit/space/space_ninja