Merge branch 'devupdate' of github.com:MistakeNot4892/Nebula into fork/pyrelight

Author: MistakeNot4892

code/__defines/hydroponics.dm

@@ -4,6 +4,7 @@
 // Defining these to point to the relevant decl types just to avoid a massive changeset.
 // TODO: rename to PLANT_TRAIT or bare decls to avoid mixing up with GetTrait etc.
 #define TRAIT_CHEMS                /decl/plant_trait/chems
+#define TRAIT_POLLEN               /decl/plant_trait/pollen
 #define TRAIT_EXUDE_GASSES         /decl/plant_trait/exude_gasses
 #define TRAIT_ALTER_TEMP           /decl/plant_trait/alter_temp
 #define TRAIT_POTENCY              /decl/plant_trait/potency

code/__defines/math_physics.dm

@@ -34,5 +34,8 @@
 #define TICKS_IN_DAY 		24*60*60*10
 #define TICKS_IN_SECOND 	10
 
-#define SIMPLE_SIGN(X) ((X) < 0 ? -1 : 1)
-#define SIGN(X)        ((X) ? SIMPLE_SIGN(X) : 0)
+#if DM_VERSION < 516
+#define SIGN(X) ( (X) ? ( (X) < 0 ? -1 : 1 ) : 0 )
+#else
+#define SIGN(X) sign(X)
+#endif

code/__defines/tools.dm

@@ -62,6 +62,7 @@
 #define IS_KNIFE(A)       IS_TOOL(A, TOOL_KNIFE)
 #define IS_HAMMER(A)      IS_TOOL(A, TOOL_HAMMER)
 #define IS_HOE(A)         IS_TOOL(A, TOOL_HOE)
+#define IS_SHEARS(A)      IS_TOOL(A, TOOL_SHEARS)
 
 #define IS_HEMOSTAT(A)    IS_TOOL(A, TOOL_HEMOSTAT)
 #define IS_RETRACTOR(A)   IS_TOOL(A, TOOL_RETRACTOR)

code/_helpers/game.dm

@@ -223,7 +223,7 @@
 		if(Y1==Y2)
 			return 1 //Light cannot be blocked on same tile
 		else
-			var/s = SIMPLE_SIGN(Y2-Y1)
+			var/s = SIGN(Y2-Y1)
 			Y1+=s
 			while(Y1!=Y2)
 				T=locate(X1,Y1,Z)
@@ -233,8 +233,8 @@
 	else
 		var/m=(32*(Y2-Y1)+(PY2-PY1))/(32*(X2-X1)+(PX2-PX1))
 		var/b=(Y1+PY1/32-0.015625)-m*(X1+PX1/32-0.015625) //In tiles
-		var/signX = SIMPLE_SIGN(X2-X1)
-		var/signY = SIMPLE_SIGN(Y2-Y1)
+		var/signX = SIGN(X2-X1)
+		var/signY = SIGN(Y2-Y1)
 		if(X1<X2)
 			b+=m
 		while(X1!=X2 || Y1!=Y2)

code/_helpers/medical_scans.dm

@@ -8,7 +8,7 @@
 		if(!brain || stat == DEAD || (status_flags & FAKEDEATH))
 			brain_result = 0
 		else if(stat != DEAD)
-			brain_result = round(max(0,(1 - brain.damage/brain.max_damage)*100))
+			brain_result = round(max(0,(1 - brain.get_organ_damage() / brain.max_damage)*100))
 	else
 		brain_result = -1
 	.["brain_activity"] = brain_result
@@ -60,29 +60,29 @@
 			.["reagents"] += list(reagent)
 
 	.["external_organs"] = list()
-	for(var/obj/item/organ/external/E in get_external_organs())
+	for(var/obj/item/organ/external/limb in get_external_organs())
 		var/list/O =               list()
-		O["name"] =                E.name
-		O["brute_ratio"] =         E.brute_ratio
-		O["burn_ratio"] =          E.burn_ratio
-		O["limb_flags"] =          E.limb_flags
-		O["brute_dam"] =           E.brute_dam
-		O["burn_dam"] =            E.burn_dam
-		O["scan_results"] =        E.get_scan_results(tag)
-		O["tumors"] =              E.has_growths()
-		O["ailments"] =            E.has_diagnosable_ailments(scanner = TRUE)
+		O["name"] =                limb.name
+		O["brute_ratio"] =         limb.brute_ratio
+		O["burn_ratio"] =          limb.burn_ratio
+		O["limb_flags"] =          limb.limb_flags
+		O["brute_dam"] =           limb.brute_dam
+		O["burn_dam"] =            limb.burn_dam
+		O["scan_results"] =        limb.get_scan_results(tag)
+		O["tumors"] =              limb.has_growths()
+		O["ailments"] =            limb.has_diagnosable_ailments(scanner = TRUE)
 		.["external_organs"] += list(O)
 
 	.["internal_organs"] = list()
 	var/list/internal_organs = get_internal_organs()
-	for(var/obj/item/organ/internal/I in internal_organs)
+	for(var/obj/item/organ/internal/organ in internal_organs)
 		var/list/O =               list()
-		O["name"] =                I.name
-		O["is_broken"] =           I.is_broken()
-		O["is_bruised"] =          I.is_bruised()
-		O["is_damaged"] =          I.damage > 0
-		O["scan_results"] =        I.get_scan_results(tag)
-		O["ailments"] =            I.has_diagnosable_ailments(scanner = TRUE)
+		O["name"] =                organ.name
+		O["is_broken"] =           organ.is_broken()
+		O["is_bruised"] =          organ.is_bruised()
+		O["is_damaged"] =          organ.get_organ_damage() > 0
+		O["scan_results"] =        organ.get_scan_results(tag)
+		O["ailments"] =            organ.has_diagnosable_ailments(scanner = TRUE)
 		.["internal_organs"] += list(O)
 
 	.["missing_organs"] = list()
@@ -270,34 +270,34 @@
 	dat += "<tr><th>Organ</th><th>Damage</th><th>Status</th></tr>"
 	subdat = list()
 
-	for(var/list/E in scan["external_organs"])
-		if(!E)
+	for(var/list/organ_data in scan["external_organs"])
+		if(!organ_data)
 			break
 		var/row = list()
-		row += "<tr><td>[E["name"]]</td>"
+		row += "<tr><td>[organ_data["name"]]</td>"
 		var/rowdata = list()
-		if(E["brute_dam"] + E["burn_dam"] == 0)
+		if(organ_data["brute_dam"] + organ_data["burn_dam"] == 0)
 			rowdata += "None"
 		else if(skill_level < SKILL_ADEPT)
-			if(E["brute_dam"])
+			if(organ_data["brute_dam"])
 				rowdata += "<span class='bad'>Damaged</span>"
-			if(E["burn_dam"])
+			if(organ_data["burn_dam"])
 				rowdata += "<span class='average'>Burned</span>"
 		else
-			if(E["brute_dam"])
-				rowdata += "<span class='bad'>[capitalize(get_wound_severity(E["brute_ratio"], (E["limb_flags"] & ORGAN_FLAG_HEALS_OVERKILL)))] physical trauma</span>"
-			if(E["burn_dam"])
-				rowdata += "<span class='average'>[capitalize(get_wound_severity(E["burn_ratio"], (E["limb_flags"] & ORGAN_FLAG_HEALS_OVERKILL)))] burns</span>"
+			if(organ_data["brute_dam"])
+				rowdata += "<span class='bad'>[capitalize(get_wound_severity(organ_data["brute_ratio"], (organ_data["limb_flags"] & ORGAN_FLAG_HEALS_OVERKILL)))] physical trauma</span>"
+			if(organ_data["burn_dam"])
+				rowdata += "<span class='average'>[capitalize(get_wound_severity(organ_data["burn_ratio"], (organ_data["limb_flags"] & ORGAN_FLAG_HEALS_OVERKILL)))] burns</span>"
 		row += "<td>[jointext(rowdata, "<br>")]</td>"
 
 		if(skill_level >= SKILL_ADEPT)
 			var/list/status = list()
-			if(E["scan_results"])
-				status += "<span class='bad'>[english_list(E["scan_results"], nothing_text = "&nbsp;")]</span>"
-			if(E["tumors"])
+			if(organ_data["scan_results"])
+				status += "<span class='bad'>[english_list(organ_data["scan_results"], nothing_text = "&nbsp;")]</span>"
+			if(organ_data["tumors"])
 				status += "<span class='bad'>Abnormal internal growth</span>"
-			if(E["ailments"])
-				status += "[jointext(E["ailments"], "<br>")]"
+			if(organ_data["ailments"])
+				status += "[jointext(organ_data["ailments"], "<br>")]"
 			row += "<td>[status ? jointext(status, "<br>") : "Nominal."]</td>"
 		else
 			row += "<td>&nbsp;</td>"
@@ -311,24 +311,24 @@
 	//Internal Organs
 	if(skill_level >= SKILL_BASIC)
 		dat += "<tr><th colspan='3'><center>Internal Organs</center></th></tr>"
-		for(var/list/I in scan["internal_organs"])
+		for(var/list/organ_data in scan["internal_organs"])
 			var/row = list()
-			row += "<tr><td>[I["name"]]</td>"
-			if(I["is_broken"])
+			row += "<tr><td>[organ_data["name"]]</td>"
+			if(organ_data["is_broken"])
 				row += "<td><span class='bad'>Severe</span></td>"
-			else if(I["is_bruised"])
+			else if(organ_data["is_bruised"])
 				row += "<td><span class='average'>Moderate</span></td>"
-			else if(I["is_damaged"])
+			else if(organ_data["is_damaged"])
 				row += "<td><span class='mild'>Minor</span></td>"
 			else
 				row += "<td>None</td>"
 
 			if(skill_level >= SKILL_ADEPT)
 				var/list/status = list()
-				if(I["scan_results"])
-					status += "<span class='bad'>[english_list(I["scan_results"], nothing_text = "&nbsp;")]</span>"
-				if(I["ailments"])
-					status += "[jointext(I["ailments"], "<br>")]"
+				if(organ_data["scan_results"])
+					status += "<span class='bad'>[english_list(organ_data["scan_results"], nothing_text = "&nbsp;")]</span>"
+				if(organ_data["ailments"])
+					status += "[jointext(organ_data["ailments"], "<br>")]"
 				row += "<td>[status ? jointext(status, "<br>") : "Nominal."]</td>"
 			else
 				row += "<td>&nbsp;</td>"

code/_helpers/unsorted.dm

@@ -169,11 +169,6 @@ Turf and target are seperate in case you want to teleport some distance from a t
 			return 1
 	return 0
 
-#if DM_VERSION < 516
-/proc/sign(x)
-	return x!=0?x/abs(x):0
-#endif
-
 /proc/getline(atom/M,atom/N)//Ultra-Fast Bresenham Line-Drawing Algorithm
 	var/px=M.x		//starting x
 	var/py=M.y
@@ -182,8 +177,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	var/dy=N.y-py
 	var/dxabs=abs(dx)//Absolute value of x distance
 	var/dyabs=abs(dy)
-	var/sdx=sign(dx)	//Sign of x distance (+ or -)
-	var/sdy=sign(dy)
+	var/sdx=SIGN(dx)	//Sign of x distance (+ or -)
+	var/sdy=SIGN(dy)
 	var/x=BITSHIFT_RIGHT(dxabs,1)	//Counters for steps taken, setting to distance/2
 	var/y=BITSHIFT_RIGHT(dyabs,1)	//Bit-shifting makes me l33t.  It also makes getline() unnessecarrily fast.
 	var/j			//Generic integer for counting

code/_onclick/click.dm

@@ -271,7 +271,7 @@
 
 /atom/proc/ShiftClick(var/mob/user)
 	if(user.client && user.client.eye == user)
-		user.examinate(src)
+		user.examine_verb(src)
 	return
 
 /*

code/_onclick/ghost.dm

@@ -35,7 +35,7 @@
 		AltClickOn(A)
 		return
 	if(modifiers["shift"])
-		examinate(A)
+		examine_verb(A)
 		return
 	A.attack_ghost(src)
 
@@ -44,7 +44,7 @@
 	if(!istype(user))
 		return
 	if(user.client && user.client.inquisitive_ghost)
-		user.examinate(src)
+		user.examine_verb(src)
 		return
 	if(user.client?.holder || user.antagHUD)
 		storage?.show_to(user)

code/_onclick/hud/hud_types/robot.dm

@@ -1,18 +1,6 @@
 /mob/living/silicon/robot
 	hud_used = /datum/hud/robot
 
-/decl/ui_style/robot
-	name = "Stationbound"
-	restricted = TRUE
-	uid = "ui_style_robot"
-	override_icons = list(
-		(HUD_HEALTH)      = 'icons/mob/screen/styles/robot/health.dmi',
-		(HUD_FIRE)        = 'icons/mob/screen/styles/robot/status_fire.dmi',
-		(HUD_OXY)         = 'icons/mob/screen/styles/robot/status_oxy.dmi',
-		(HUD_UP_HINT)     = 'icons/mob/screen/styles/robot/uphint.dmi',
-		(HUD_ZONE_SELECT) = 'icons/mob/screen/styles/robot/zone_selector.dmi'
-	)
-
 /datum/hud/robot/get_ui_style_data()
 	return GET_DECL(/decl/ui_style/robot)
 
@@ -39,13 +27,10 @@
 /datum/hud/proc/toggle_show_robot_modules()
 	if(!isrobot(mymob))
 		return
-
 	var/mob/living/silicon/robot/r = mymob
-
 	r.shown_robot_modules = !r.shown_robot_modules
 	update_robot_modules_display()
 
-
 /datum/hud/proc/update_robot_modules_display()
 	if(!isrobot(mymob) || !mymob.client)
 		return

code/_onclick/hud/screen/_screen.dm

@@ -96,7 +96,7 @@
 /obj/screen/Click(location, control, params)
 	var/list/paramlist = params2list(params)
 	if(paramlist["shift"])
-		return examine(usr, 0)
+		return examined_by(usr, 0)
 	if(ismob(usr) && usr.client && usr.canClick() && (!user_incapacitation_flags || !usr.incapacitated(user_incapacitation_flags)))
 		return handle_click(usr, params)
 	return FALSE