Merge pull request #169 from CIB/master

Map fixes regarding medical

baystation12.dme

@@ -144,7 +144,6 @@
 #define FILE_DIR "code/WorkInProgress/SkyMarshal"
 #define FILE_DIR "code/WorkInProgress/Tastyfish"
 #define FILE_DIR "code/WorkInProgress/virus2"
-#define FILE_DIR "code/WorkInProgress/Wrongnumber"
 #define FILE_DIR "html"
 #define FILE_DIR "icons"
 #define FILE_DIR "icons/effects"
@@ -985,7 +984,6 @@
 #include "code\WorkInProgress\mapload\reader.dm"
 #include "code\WorkInProgress\Mini\customitems.dm"
 #include "code\WorkInProgress\SkyMarshal\coatrack.dm"
-#include "code\WorkInProgress\SkyMarshal\eraser.dm"
 #include "code\WorkInProgress\SkyMarshal\policetape.dm"
 #include "code\WorkInProgress\Tastyfish\Eliza.dm"
 #include "code\WorkInProgress\Tastyfish\Eliza_Data.dm"

code/WorkInProgress/SkyMarshal/eraser.dm

@@ -1,9 +0,0 @@
-/obj/item/weapon/stamperaser
-	name = "Eraser"
-	desc = "Some type of eraser, you guess."
-	flags = FPRINT | TABLEPASS
-	icon = 'items.dmi'
-	icon_state = "zippo"
-	item_state = "zippo"
-	w_class = 1.0
-	m_amt = 80

code/datums/diseases/alien_embryo.dm

@@ -11,7 +11,6 @@
 	max_stages = 5
 	spread = "None"
 	spread_type = SPECIAL
-	stage_prob = 2
 	cure = "Unknown"
 	cure_id = list("lexorin","toxin","gargleblaster")
 	cure_chance = 20

code/defines/mob/living/carbon/carbon.dm

@@ -5,7 +5,6 @@
 	var/brain_op_stage = 0.0
 	var/eye_op_stage = 0.0
 	var/appendix_op_stage = 0.0
-	var/embryo_op_stage = 0.0
 
 	var/datum/disease2/disease/virus2 = null
 	var/list/datum/disease2/disease/resistances2 = list()

code/defines/obj/weapon.dm

@@ -824,7 +824,6 @@
 	icon = 'paper.dmi'
 	icon_state = "paper"
 	var/info = null
-	var/infoold = null
 	throwforce = 0
 	w_class = 1.0
 	throw_speed = 3
@@ -1459,11 +1458,6 @@
 	icon_state = "stamp-hos"
 	color = "hosred"
 
-/obj/item/weapon/stamp/detective
-	name = "detective's rubber stamp"
-	icon_state = "stamp-hos"
-	color = "hosred"
-
 /obj/item/weapon/stamp/ce
 	name = "chief engineer's rubber stamp"
 	icon_state = "stamp-ce"
@@ -1522,7 +1516,7 @@
 	name = "d4"
 	desc = "A dice with four sides."
 	sides = 4
-	icon_state = "dice"
+	icon_state = "d20"
 	item_state = "dice"
 
 /obj/item/weapon/dice // -- TLE
@@ -1714,4 +1708,4 @@
 	desc = "A container for hold compressed matter awaiting re-construction."
 	origin_tech = "materials=5"
 	rating = 3
-	m_amt = 80
+	m_amt = 80

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

@@ -41,7 +41,6 @@
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=thermal'>Thermal Glasses</A> (4)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=eraser'>Stamp Remover</A> (1)<BR>" //Allows doccuments to be de-stamped
 	menu_message += "<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_uplink'>Uplink Implant (5 crystals inside)</A> (10)<BR>"
@@ -213,10 +212,6 @@
 				if(uses >= 10)
 					uses -= 10
 					new /obj/item/weapon/storage/box/syndicate(get_turf(hostpda))
-			if("eraser")
-				if(uses >= 1)
-					uses -= 1
-					new /obj/item/weapon/stamperaser(get_turf(hostpda))
 
 		generate_menu()
 		print_to_host(menu_message)

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

@@ -124,7 +124,6 @@ CLIPBOARDS
 		if(istype(P, /obj/item/weapon/stamp))
 			if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
 				return
-			src.infoold = src.info
 			src.info += text("<BR><i>This paper has been stamped with the [].</i><BR>", P.name)
 			switch(P.type)
 				if(/obj/item/weapon/stamp/captain)
@@ -142,7 +141,11 @@ CLIPBOARDS
 				if(/obj/item/weapon/stamp/denied)
 					src.overlays += "paper_stamped_denied"
 				if(/obj/item/weapon/stamp/clown)
-					src.overlays += "paper_stamped_clown"
+					if (!clown)
+						usr << "\red You are totally unable to use the stamp. HONK!"
+						return
+					else
+						src.overlays += "paper_stamped_clown"
 				else
 					src.overlays += "paper_stamped"
 			if(!stamped)
@@ -150,35 +153,6 @@ CLIPBOARDS
 			stamped += P.type
 
 			user << "\blue You stamp the paper with your rubber stamp."
-
-	else if(istype(P, /obj/item/weapon/stamperaser))
-		if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
-				return
-		src.info = src.infoold
-		for(var/i, i <= stamped.len, i++)
-			switch(stamped[i])
-				if(/obj/item/weapon/stamp/captain)
-					src.overlays -= "paper_stamped_cap"
-				if(/obj/item/weapon/stamp/hop)
-					src.overlays -= "paper_stamped_hop"
-				if(/obj/item/weapon/stamp/hos)
-					src.overlays -= "paper_stamped_hos"
-				if(/obj/item/weapon/stamp/ce)
-					src.overlays -= "paper_stamped_ce"
-				if(/obj/item/weapon/stamp/rd)
-					src.overlays -= "paper_stamped_rd"
-				if(/obj/item/weapon/stamp/cmo)
-					src.overlays -= "paper_stamped_cmo"
-				if(/obj/item/weapon/stamp/denied)
-					src.overlays -= "paper_stamped_denied"
-				if(/obj/item/weapon/stamp/clown)
-					src.overlays -= "paper_stamped_clown"
-				else
-					src.overlays -= "paper_stamped"
-		stamped = new list()
-
-		user << "\blue You sucessfully remove those pesky stamps."
-
 	/*
 	else
 		if (istype(P, /obj/item/weapon/weldingtool))

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

@@ -19,32 +19,6 @@ CIRCULAR SAW
 	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && (M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(50))))
 		return ..()
 
-	if(user.zone_sel.selecting == "chest")
-		if(istype(M, /mob/living/carbon/human))
-			switch(M:embryo_op_stage)
-				if(2.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [user] retracts the flap in [M]'s cut open torso with [src].", 1)
-						M << "\red [user] begins to retracts the flap in your chest with [src]!"
-						user << "\red You clamp retracts the flap in [M]'s torso with [src]!"
-						M:embryo_op_stage = 3.0
-						return
-				if(4.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [user] rips the larva out of [M]'s torso!", 1)
-						M << "\red [user] begins to rip the larva out of [M]'s torso!"
-						user << "\red You rip the larva out of [M]'s torso!"
-						var/mob/living/carbon/alien/larva/stupid = new(M.loc)
-						stupid.death(0)
-						//Make a larva and kill it. -- SkyMarshal
-						M:embryo_op_stage = 5.0
-						for(var/datum/disease/alien_embryo in M.viruses)
-							alien_embryo.cure()
-						return
-		return
-
 	if(user.zone_sel.selecting == "groin")
 		if(istype(M, /mob/living/carbon/human))
 			switch(M:appendix_op_stage)
@@ -118,26 +92,6 @@ CIRCULAR SAW
 	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
 		return ..()
 
-	if(user.zone_sel.selecting == "chest")
-		if(istype(M, /mob/living/carbon/human))
-			switch(M:embryo_op_stage)
-				if(1.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [user] is beginning to clamp bleeders in [M]'s cut open torso with [src].", 1)
-						M << "\red [user] begins to torso bleeders in your chest with [src]!"
-						user << "\red You clamp bleeders in [M]'s torso with [src]!"
-						M:embryo_op_stage = 2.0
-						return
-				if(5.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [user] cleans out the debris from [M]'s cut open torso with [src].", 1)
-						M << "\red [user] begins to clean out the debris in your torso with [src]!"
-						user << "\red You clean out the debris from in [M]'s torso with [src]!"
-						M:embryo_op_stage = 6.0
-						return
-
 	if(user.zone_sel.selecting == "groin")
 		if(istype(M, /mob/living/carbon/human))
 			switch(M:appendix_op_stage)
@@ -223,18 +177,6 @@ CIRCULAR SAW
 	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
 		return ..()
 
-	if(user.zone_sel.selecting == "chest")
-		if(istype(M, /mob/living/carbon/human))
-			switch(M:embryo_op_stage)
-				if(6.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [user] is beginning to cauterize the incision in [M]'s torso with [src].", 1)
-						M << "\red [user] begins to cauterize the incision in your torso with [src]!"
-						user << "\red You cauterize the incision in [M]'s torso with [src]!"
-						M:embryo_op_stage = 7.0
-						return
-
 	if(user.zone_sel.selecting == "groin")
 		if(istype(M, /mob/living/carbon/human))
 			switch(M:appendix_op_stage)
@@ -322,28 +264,6 @@ CIRCULAR SAW
 
 	src.add_fingerprint(user)
 
-	if(user.zone_sel.selecting == "chest")
-		if(istype(M, /mob/living/carbon/human))
-			switch(M:embryo_op_stage)
-				if(0.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [M] is beginning to have his torso cut open with [src] by [user].", 1)
-						M << "\red [user] begins to cut open your torso with [src]!"
-						user << "\red You cut [M]'s torso open with [src]!"
-						M:embryo_op_stage = 1.0
-				if(3.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [M] is beginning to have his stomach cut open with [src] by [user].", 1)
-						M << "\red [user] begins to cut open your stomach with [src]!"
-						user << "\red You cut [M]'s stomach open with [src]!"
-						for(var/datum/disease/D in M.viruses)
-							if(istype(D, /datum/disease/alien_embryo))
-								user << "\red There's something wiggling in there!"
-								M:embryo_op_stage = 4.0
-			return
-
 	if(user.zone_sel.selecting == "groin")
 		if(istype(M, /mob/living/carbon/human))
 			switch(M:appendix_op_stage)

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

@@ -44,10 +44,9 @@ SYNDICATE UPLINK
 			dat += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=thermal'>Thermal Glasses</A> (4)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=eraser'>Stamp Remover</A> (1)<BR>"
 			dat += "<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
-//			dat += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
+			dat += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
 			dat += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (4)<BR>" //Terrible -Pete. //Reinstated -Skymarshal
 			dat += "<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=detomatix'>Detomatix Cartridge</A> (3)<BR>"
@@ -197,10 +196,6 @@ SYNDICATE UPLINK
 					if (src.uses >= 10)
 						uses -= 10
 						new /obj/item/toy/syndicateballoon(get_turf(src))
-				if("eraser")
-					if(uses)
-						uses --
-						new /obj/item/weapon/stamperaser(get_turf(hostpda))
 		else if (href_list["lock"] && src.origradio)
 			// presto chango, a regular radio again! (reset the freq too...)
 			shutdown_uplink()