Revert "pls"

This reverts commit 8c97511871.
2019-11-24 03:04:04 +00:00
parent 4c1c257035
commit c8b206a4cf
3003 changed files with 63963 additions and 157107 deletions
@@ -34,7 +34,7 @@
 	update_icon()
 	..()

-/obj/item/organ/appendix/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/appendix/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	..()
 	if(inflamed)
 		M.ForceContractDisease(new /datum/disease/appendicitis(), FALSE, TRUE)
@@ -128,8 +128,8 @@
 	var/on = FALSE
 	var/datum/effect_system/trail_follow/ion/ion_trail

-/obj/item/organ/cyberimp/chest/thrusters/Insert(mob/living/carbon/M, special = 0)
-	..()
+/obj/item/organ/cyberimp/chest/thrusters/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
+	. = ..()
 	if(!ion_trail)
 		ion_trail = new
 	ion_trail.set_up(M)
@@ -151,10 +151,14 @@
 		on = TRUE
 		if(allow_thrust(0.01))
 			ion_trail.start()
+			RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/move_react)
+			owner.add_movespeed_modifier(MOVESPEED_ID_CYBER_THRUSTER, priority=100, multiplicative_slowdown=-2, movetypes=FLOATING, conflict=MOVE_CONFLICT_JETPACK)
 			if(!silent)
 				to_chat(owner, "<span class='notice'>You turn your thrusters set on.</span>")
 	else
 		ion_trail.stop()
+		UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
+		owner.remove_movespeed_modifier(MOVESPEED_ID_CYBER_THRUSTER)
 		if(!silent)
 			to_chat(owner, "<span class='notice'>You turn your thrusters set off.</span>")
 		on = FALSE
@@ -169,6 +173,9 @@
 		var/datum/action/A = X
 		A.UpdateButtonIcon()

+/obj/item/organ/cyberimp/chest/thrusters/proc/move_react()
+	allow_thrust(0.01)
+
 /obj/item/organ/cyberimp/chest/thrusters/proc/allow_thrust(num)
 	if(!on || !owner)
 		return 0
@@ -142,22 +142,3 @@
 	if(prob(60/severity))
 		to_chat(owner, "<span class='warning'>Your breathing tube suddenly closes!</span>")
 		owner.losebreath += 2
-
-//BOX O' IMPLANTS
-
-/obj/item/storage/box/cyber_implants
-	name = "boxed cybernetic implants"
-	desc = "A sleek, sturdy box."
-	icon_state = "cyber_implants"
-	var/list/boxed = list(
-		/obj/item/autosurgeon/thermal_eyes,
-		/obj/item/autosurgeon/xray_eyes,
-		/obj/item/autosurgeon/anti_stun,
-		/obj/item/autosurgeon/reviver)
-	var/amount = 5
-
-/obj/item/storage/box/cyber_implants/PopulateContents()
-	var/implant
-	while(contents.len <= amount)
-		implant = pick(boxed)
-		new implant(src)
@@ -103,6 +103,26 @@
 /obj/item/autosurgeon/anti_drop
 	starting_organ = /obj/item/organ/cyberimp/brain/anti_drop

+//BOX O' IMPLANTS
+
+/obj/item/storage/box/cyber_implants
+	name = "boxed cybernetic implants"
+	desc = "A sleek, sturdy box."
+	icon_state = "syndiebox"
+	illustration = "cyber_implants"
+	var/list/boxed = list(
+		/obj/item/autosurgeon/thermal_eyes,
+		/obj/item/autosurgeon/xray_eyes,
+		/obj/item/autosurgeon/anti_stun,
+		/obj/item/autosurgeon/reviver)
+	var/amount = 5
+
+/obj/item/storage/box/cyber_implants/PopulateContents()
+	var/implant
+	while(contents.len <= amount)
+		implant = pick(boxed)
+		new implant(src)
+
 /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
@@ -227,7 +227,7 @@
 	terminate_effects()
 	. = ..()

-/obj/item/organ/eyes/robotic/glow/Remove()
+/obj/item/organ/eyes/robotic/glow/Remove(mob/living/carbon/M, special = FALSE)
 	terminate_effects()
 	. = ..()

@@ -338,7 +338,7 @@
 /obj/item/organ/eyes/robotic/glow/proc/start_visuals()
 	if(!islist(eye_lighting))
 		regenerate_light_effects()
-	if((eye_lighting.len < light_beam_distance) || !on_mob)
+	if((LAZYLEN(eye_lighting) < light_beam_distance) || !on_mob)
 		regenerate_light_effects()
 	sync_light_effects()
 	update_visuals()
@@ -57,7 +57,7 @@

 /obj/item/organ/heart/prepare_eat()
 	var/obj/S = ..()
-	S.icon_state = "heart-off"
+	S.icon_state = "[icon_base]-off"
 	return S

 /obj/item/organ/heart/on_life()
@@ -90,6 +90,12 @@
 		owner.set_heartattack(TRUE)
 		failed = TRUE

+obj/item/organ/heart/slime
+	name = "slime heart"
+	desc = "It seems we've gotten to the slimy core of the matter."
+	icon_state = "heart-s-on"
+	icon_base = "heart-s"
+
 /obj/item/organ/heart/cursed
 	name = "cursed heart"
 	desc = "A heart that, when inserted, will force you to pump it manually."
@@ -129,7 +135,7 @@
 		else
 			last_pump = world.time //lets be extra fair *sigh*

-/obj/item/organ/heart/cursed/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/cursed/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	..()
 	if(owner)
 		to_chat(owner, "<span class ='userdanger'>Your heart has been replaced with a cursed one, you have to pump this one manually otherwise you'll die!</span>")
@@ -211,6 +217,19 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()



+/obj/item/organ/heart/ipc
+	name = "IPC heart"
+	desc = "An electronic pump that regulates hydraulic functions, they have an auto-restart after EMPs."
+	icon_state = "heart-c"
+	organ_flags = ORGAN_SYNTHETIC
+
+/obj/item/organ/heart/ipc/emp_act()
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
+	Stop()
+	addtimer(CALLBACK(src, .proc/Restart), 10)
+
 /obj/item/organ/heart/freedom
 	name = "heart of freedom"
 	desc = "This heart pumps with the passion to give... something freedom."
@@ -28,7 +28,7 @@

 /obj/item/organ/proc/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	if(!iscarbon(M) || owner == M)
-		return
+		return FALSE

 	var/obj/item/organ/replaced = M.getorganslot(slot)
 	if(replaced)
@@ -50,6 +50,8 @@
 		A.Grant(M)
 	STOP_PROCESSING(SSobj, src)

+	return TRUE
+
 //Special is for instant replacement like autosurgeons
 /obj/item/organ/proc/Remove(mob/living/carbon/M, special = FALSE)
 	owner = null
@@ -64,6 +66,8 @@
 		A.Remove(M)
 	START_PROCESSING(SSobj, src)

+	return TRUE
+
 /obj/item/organ/proc/on_find(mob/living/finder)
 	return

@@ -181,7 +185,7 @@
 	if(owner)
 		// The special flag is important, because otherwise mobs can die
 		// while undergoing transformation into different mobs.
-		Remove(owner, special=TRUE)
+		Remove(owner, TRUE)
 	return ..()

 /obj/item/organ/attack(mob/living/carbon/M, mob/user)
@@ -62,7 +62,7 @@
 		to_chat(owner, "<span class='notice'>Your tongue is really starting to hurt.</span>")


-/obj/item/organ/tongue/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/tongue/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	..()
 	if(say_mod && M.dna && M.dna.species)
 		M.dna.species.say_mod = say_mod
@@ -233,7 +233,6 @@
 	name = "plasma bone \"tongue\""
 	desc = "Like animated skeletons, Plasmamen vibrate their teeth in order to produce speech."
 	icon_state = "tongueplasma"
-	maxHealth = "alien"
 	modifies_speech = FALSE

 /obj/item/organ/tongue/robot
@@ -140,7 +140,7 @@
 	user.say(message, spans = span_list, sanitize = FALSE)

 	message = lowertext(message)
-	var/mob/living/list/listeners = list()
+	var/list/mob/living/listeners = list()
 	for(var/mob/living/L in get_hearers_in_view(8, user))
 		if(L.can_hear() && !L.anti_magic_check(FALSE, TRUE) && L.stat != DEAD)
 			if(L == user && !include_speaker)
@@ -663,7 +663,7 @@

 	//FIND THRALLS
 	message = lowertext(message)
-	var/mob/living/list/listeners = list()
+	var/list/mob/living/listeners = list()
 	for(var/mob/living/L in get_hearers_in_view(8, user))
 		if(L.can_hear() && !L.anti_magic_check(FALSE, TRUE) && L.stat != DEAD)
 			if(L.has_status_effect(/datum/status_effect/chem/enthrall))//Check to see if they have the status
@@ -917,7 +917,7 @@
 					speaktrigger += "[(H.client?.prefs.lewdchem?"You are my whole world and all of my being belongs to you, ":"I cannot think of anything else but aiding your cause, ")] "//Redflags!!

 			//mood
-			GET_COMPONENT_FROM(mood, /datum/component/mood, H)
+			var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
 			switch(mood.sanity)
 				if(SANITY_GREAT to INFINITY)
 					speaktrigger += "I'm beyond elated!! " //did you mean byond elated? hohoho