Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

2026-08-23 20:16:55 +01:00 · 2016-01-21 21:11:26 -05:00
parent 363da58264 e7ce3bc19e
commit 95dca71432
243 changed files with 3619 additions and 2933 deletions
@@ -140,14 +140,14 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	temp = new /icon(icobase, "head_[g]")
 	preview_icon.Blend(temp, ICON_OVERLAY)

-	for(var/obj/item/organ/external/E in H.organs)
-		preview_icon.Blend(E.get_icon(), ICON_OVERLAY)
-
 	//Tail
 	if(H.species.tail && H.species.flags & HAS_TAIL)
 		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.species.tail]_s")
 		preview_icon.Blend(temp, ICON_OVERLAY)

+	for(var/obj/item/organ/external/E in H.organs)
+		preview_icon.Blend(E.get_icon(), ICON_OVERLAY)
+
 	// Skin tone
 	if(H.species.bodyflags & HAS_SKIN_TONE)
 		if (H.s_tone >= 0)
@@ -71,7 +71,13 @@ var/datum/atom_hud/huds = list( \
 	//	for(var/datum/gang/G in ticker.mode.gangs)
 	//		gang_huds += G.ganghud

-	for(var/datum/atom_hud/hud in huds)//|gang_huds))
+	var/serv_huds = list()//mindslaves and/or vampire thralls
+	if(ticker.mode)
+		for(var/datum/mindslaves/serv in (ticker.mode.vampires | ticker.mode.traitors))
+			serv_huds += serv.thrallhud
+
+
+	for(var/datum/atom_hud/hud in (huds|serv_huds))//|gang_huds))
 		if(src in hud.hudusers)
 			hud.add_hud_to(src)

@@ -60,6 +60,7 @@

 	var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state
 	var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD
+	var/datum/mindslaves/som //stands for slave or master...hush..

 	var/rev_cooldown = 0

@@ -146,7 +147,7 @@
 	var/mob/living/carbon/human/H = current
 	if (istype(current, /mob/living/carbon/human))
 		/** Impanted**/
-		if(H.is_loyalty_implanted())
+		if(isloyal(H))
 			text = "Loyalty Implant:<a href='?src=\ref[src];implant=remove'>Remove</a>|<b>Implanted</b></br>"
 		else
 			text = "Loyalty Implant:<b>No Implant</b>|<a href='?src=\ref[src];implant=add'>Implant him!</a></br>"
@@ -156,7 +157,7 @@
 		if (ticker.mode.config_tag=="revolution")
 			text += uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (H.is_loyalty_implanted())
+		if (isloyal(H))
 			text += "<b>LOYAL EMPLOYEE</b>|headrev|rev"
 		else if (src in ticker.mode.head_revolutionaries)
 			text = "<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
@@ -192,7 +193,7 @@
 		if (ticker.mode.config_tag=="cult")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (H.is_loyalty_implanted())
+		if (isloyal(H))
 			text += "<B>LOYAL EMPLOYEE</B>|cultist"
 		else if (src in ticker.mode.cult)
 			text += "<a href='?src=\ref[src];cult=clear'>employee</a>|<b>CULTIST</b>"
@@ -306,7 +307,7 @@
 		if (ticker.mode.config_tag=="traitor" || ticker.mode.config_tag=="traitorchan")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (H.is_loyalty_implanted())
+		if (isloyal(H))
 			text +="traitor|<b>LOYAL EMPLOYEE</b>"
 		else
 			if (src in ticker.mode.traitors)
@@ -618,9 +619,9 @@
 		switch(href_list["implant"])
 			if("remove")
 				for(var/obj/item/weapon/implant/loyalty/I in H.contents)
-					for(var/obj/item/organ/external/organs in H.organs)
-						if(I in organs.implants)
-							qdel(I)
+					if(I && I.implanted)
+						I.removed(H)
+						qdel(I)
 				H << "\blue <Font size =3><B>Your loyalty implant has been deactivated.</B></FONT>"
 				log_admin("[key_name(usr)] has deactivated [key_name(current)]'s loyalty implant")
 				message_admins("[key_name_admin(usr)] has deactivated [key_name_admin(current)]'s loyalty implant")
@@ -628,9 +629,6 @@
 				var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 				L.imp_in = H
 				L.implanted = 1
-				var/obj/item/organ/external/affected = H.organs_by_name["head"]
-				affected.implants += L
-				L.part = affected
 				H.sec_hud_set_implants()

 				log_admin("[key_name(usr)] has given [key_name(current)] a loyalty implant")
@@ -654,11 +652,6 @@
 						cult.memorize_cult_objectives(src)
 					current << "\red <FONT size = 3><B>The nanobots in the loyalty implant remove all thoughts about being in a cult.  Have a productive day!</B></FONT>"
 					memory = ""
-				if(src in ticker.mode.traitors)
-					ticker.mode.traitors -= src
-					special_role = null
-					current << "\red <FONT size = 3><B>The nanobots in the loyalty implant remove all thoughts about being a traitor to Nanotrasen.  Have a nice day!</B></FONT>"
-					log_admin("[key_name_admin(usr)] has de-traitor'ed [current].")

 	else if (href_list["revolution"])

@@ -903,6 +896,9 @@
 					ticker.mode.vampires += src
 					ticker.mode.grant_vampire_powers(current)
 					ticker.mode.update_vampire_icons_added(src)
+					var/datum/mindslaves/slaved = new()
+					slaved.masters += src
+					src.som = slaved //we MIGT want to mindslave someone
 					special_role = "Vampire"
 					current << "<B><font color='red'>Your powers are awoken. Your lust for blood grows... You are a Vampire!</font></B>"
 					log_admin("[key_name(usr)] has vampired [key_name(current)]")
@@ -999,6 +995,9 @@
 			if("traitor")
 				if(!(src in ticker.mode.traitors))
 					ticker.mode.traitors += src
+					var/datum/mindslaves/slaved = new()
+					slaved.masters += src
+					src.som = slaved //we MIGT want to mindslave someone
 					special_role = "traitor"
 					current << "<B>\red You are a traitor!</B>"
 					log_admin("[key_name(usr)] has traitored [key_name(current)]")
@@ -26,6 +26,10 @@

 	var/area/thearea = teleportlocs[A]

+	if(thearea.tele_proof && !istype(thearea, /area/wizard_station))
+		usr << "A mysterious force disrupts your arcane spell matrix, and you remain where you are."
+		return
+
 	return thearea

 /obj/effect/proc_holder/spell/targeted/area_teleport/cast(list/targets,area/thearea)
@@ -720,9 +720,9 @@ var/list/uplink_items = list()

 /datum/uplink_item/device_tools/elite_hardsuit
 	name = "Elite Syndicate Hardsuit"
-	desc = "The elite Syndicate hardsuit is worn by only the best nuclear agents. Features much better armoring and complete fireproofing, as well as a built in jetpack. \
-	When the built in helmet is deployed your identity will be protected, even in death, as the suit cannot be removed by outside forces. Toggling the suit into combat mode \
-	will allow you all the mobility of a loose fitting uniform without sacrificing armoring. Additionally the suit is collapsible, small enough to fit within a backpack. \
+	desc = "The elite Syndicate hardsuit is worn by only the best nuclear agents. Features much better armoring and complete fireproofing. \
+	When the built in helmet is deployed your identity will be protected. Toggling the suit into combat mode will allow you all the mobility \
+	of a loose fitting uniform without sacrificing armoring. Additionally the suit is collapsible, small enough to fit within a backpack. \
 	Nanotrasen crewmembers are trained to report red space suit sightings; these suits in particular are known to drive employees into a panic."
 	reference = "ESHS"
 	item = /obj/item/weapon/storage/box/syndie_kit/elite_hardsuit
@@ -875,18 +875,11 @@ var/list/uplink_items = list()
 	cost = 14
 	surplus = 0

-/datum/uplink_item/implants/explosive
-	name = "Explosive Implant"
-	desc = "An implant injected into the body, and later activated using a vocal command to cause a large explosion from the implant."
-	reference = "EI"
-	item = /obj/item/weapon/implanter/explosive
-	cost = 12
-
-/datum/uplink_item/implants/compression
-	name = "Compressed Matter Implant"
-	desc = "An implant injected into the body, and later activated using a bodily gesture to retrieve an item that was earlier compressed."
-	reference = "CI"
-	item = /obj/item/weapon/implanter/compressed
+/datum/uplink_item/implants/storage
+	name = "Storage Implant"
+	desc = "An implant injected into the body, and later activated at the user's will. It will open a small subspace pocket capable of storing two items."
+	reference = "ESI"
+	item = /obj/item/weapon/implanter/storage
 	cost = 8

 /datum/uplink_item/implants/mindslave
@@ -903,6 +896,15 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/implanter/adrenalin
 	cost = 8

+/datum/uplink_item/implants/microbomb
+	name = "Microbomb Implant"
+	desc = "An implant injected into the body, and later activated either manually or automatically upon death. The more implants inside of you, the higher the explosive power. \
+	This will permanently destroy your body, however."
+	reference = "MBI"
+	item = /obj/item/weapon/implanter/explosive
+	cost = 2
+	gamemodes = list(/datum/game_mode/nuclear)
+
 // POINTLESS BADASSERY

 /datum/uplink_item/badass
@@ -949,6 +951,14 @@ var/list/uplink_items = list()
 	item = /obj/item/toy/syndicateballoon
 	cost = 20

+/datum/uplink_item/implants/macrobomb
+	name = "Macrobomb Implant"
+	desc = "An implant injected into the body, and later activated either manually or automatically upon death. Upon death, releases a massive explosion that will wipe out everything nearby."
+	reference = "HAB"
+	item = /obj/item/weapon/implanter/explosive_macro
+	cost = 20
+	gamemodes = list(/datum/game_mode/nuclear)
+
 /*/datum/uplink_item/badass/random
 	name = "Random Item"
 	desc = "Picking this choice will send you a random item from the list. Useful for when you cannot think of a strategy to finish your objectives with."