Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

…Hybrisa

code/game/objects/structures/crates_lockers/closets/phonebox.dm

@@ -88,27 +88,27 @@
 	update_icon()
 
 /obj/structure/machinery/phonebox/allow_drop()
-	return 0
+	return FALSE
 
 /obj/structure/machinery/phonebox/relaymove(mob/user as mob)
 	if(user.stat)
 		return
-	src.go_out()
+	go_out()
 	return
 
 /obj/structure/machinery/phonebox/update_icon()
 	..()
 	if(stat & NOPOWER)
 		if(!open)
 			icon_state = "phonebox_off_empty_closed"
-			if(src.occupant)
+			if(occupant)
 				icon_state = "phonebox_off_full_closed"
 		else
 			icon_state = "phonebox_off_open"
 	else
 		if(!open)
 			icon_state = "phonebox_on_empty_closed"
-			if(src.occupant)
+			if(occupant)
 				icon_state = "phonebox_on_full_closed"
 		else
 			icon_state =  "phonebox_on_open"
@@ -144,10 +144,10 @@
 		M.client.perspective = EYE_PERSPECTIVE
 		M.client.eye = src
 	M.forceMove(src)
-	src.occupant = M
+	occupant = M
 	start_processing()
-	src.add_fingerprint(usr)
-	src.open = FALSE
+	add_fingerprint(usr)
+	open = FALSE
 	update_icon()
 	return TRUE
 
@@ -158,16 +158,16 @@
 	set src in oview(1)
 	if (usr.stat != 0)
 		return
-	src.go_out()
+	go_out()
 	add_fingerprint(usr)
 	return
 
 /obj/structure/machinery/phonebox/attack_hand(mob/living/user)
-	if(src.open)
-		src.open = FALSE
+	if(open)
+		open = FALSE
 	else
-		src.open = TRUE
-	src.go_out()
+		open = TRUE
+	go_out()
 	update_icon()
 
 

code/game/objects/structures/fence.dm

@@ -313,15 +313,15 @@ GLOBAL_LIST_INIT(all_fences, list())
 	spark_system.start(src)
 
 /obj/structure/fence/electrified/attackby(obj/item/W, mob/user)
-	if(src.electrified && !src.cut)
+	if(electrified && !cut)
 		if(istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/human = user
 			if(human.gloves)
-				var/obj/item/clothing/gloves/G = human.gloves
-				if(G.siemens_coefficient != 0)
-					src.electrocute_human(human)
+				var/obj/item/clothing/gloves/worn_gloves = human.gloves
+				if(worn_gloves.siemens_coefficient != 0)
+					electrocute_human(human)
 			else
-				src.electrocute_human(human)
+				electrocute_human(human)
 	. = ..()
 
 /obj/structure/fence/electrified/ex_act(severity)

code/game/objects/structures/window.dm

@@ -1057,7 +1057,7 @@
 	basestate = "strata_window"
 	desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it."
 	health = 100
-	reinf = 1
+	reinf = TRUE
 	window_frame = /obj/structure/window_frame/hybrisa/colony/reinforced
 
 /obj/structure/window/framed/hybrisa/colony/hull
@@ -1086,7 +1086,7 @@
 	basestate = "strata_window"
 	desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it."
 	health = 100
-	reinf = 1
+	reinf = TRUE
 	window_frame = /obj/structure/window_frame/hybrisa/research/reinforced
 
 /obj/structure/window/framed/hybrisa/research/hull
@@ -1111,7 +1111,7 @@
 	name = "reinforced window"
 	desc = "A glass window with a special rod matrix inside a wall frame. It looks rather strong. Might take a few good hits to shatter it."
 	health = 100
-	reinf = 1
+	reinf = TRUE
 	icon_state = "prison_rwindow0"
 	basestate = "prison_rwindow"
 	window_frame = /obj/structure/window_frame/hybrisa/marshalls/reinforced
@@ -1138,7 +1138,7 @@
 	basestate = "strata_window"
 	desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it."
 	health = 100
-	reinf = 1
+	reinf = TRUE
 	window_frame = /obj/structure/window_frame/hybrisa/colony/hospital/reinforced
 
 /obj/structure/window/framed/hybrisa/colony/hospital/hull
@@ -1168,7 +1168,7 @@
 	basestate = "strata_window"
 	desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it."
 	health = 100
-	reinf = 1
+	reinf = TRUE
 	window_frame = /obj/structure/window_frame/hybrisa/colony/office/reinforced
 
 /obj/structure/window/framed/hybrisa/colony/office/hull
@@ -1198,7 +1198,7 @@
 	basestate = "strata_window"
 	desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it."
 	health = 100
-	reinf = 1
+	reinf = TRUE
 	window_frame = /obj/structure/window_frame/hybrisa/colony/engineering/reinforced
 
 /obj/structure/window/framed/hybrisa/colony/engineering/hull
@@ -1223,7 +1223,7 @@
 	name = "reinforced window"
 	desc = "A glass window with a special rod matrix inside a wall frame. It looks rather strong. Might take a few good hits to shatter it."
 	health = 100
-	reinf = 1
+	reinf = TRUE
 	icon_state = "prison_rwindow0"
 	basestate = "prison_rwindow"
 	window_frame = /obj/structure/window_frame/hybrisa/spaceport/reinforced

code/game/turfs/walls/wall_types.dm

@@ -1343,7 +1343,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	icon = 'icons/turf/walls/engineership.dmi'
 	icon_state = "metal"//DMI specific name
 	walltype = WALL_HUNTERSHIP
-	hull = 1
+	hull = TRUE
 
 // Rock
 /turf/closed/wall/hybrisa/rock
@@ -1352,7 +1352,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	icon = 'icons/turf/walls/kutjevorockdark.dmi'
 	icon_state = "rock"
 	walltype = WALL_KUTJEVO_ROCK
-	hull = 1
+	hull = TRUE
 
 // Marshalls
 /turf/closed/wall/hybrisa/marhsalls
@@ -1372,7 +1372,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	icon = 'icons/turf/walls/hybrisa_marshalls.dmi'
 	icon_state = "hwall"
 	walltype = WALL_REINFORCED
-	hull = 1
+	hull = TRUE
 
 // Research
 
@@ -1399,7 +1399,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	damage_cap = HEALTH_WALL_REINFORCED
 
 /turf/closed/wall/hybrisa/research/reinforced/hull
-	hull = 1
+	hull = TRUE
 	icon_state = "strata_hull"
 	desc = "A thick and chunky metal wall that is, just by virtue of its placement and imposing presence, entirely indestructible."
 
@@ -1427,7 +1427,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	damage_cap = HEALTH_WALL_REINFORCED
 
 /turf/closed/wall/hybrisa/colony/reinforced/hull
-	hull = 1
+	hull = TRUE
 	icon_state = "strata_hull"
 	desc = "A thick and chunky metal wall that is, just by virtue of its placement and imposing presence, entirely indestructible."
 
@@ -1456,7 +1456,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	damage_cap = HEALTH_WALL_REINFORCED
 
 /turf/closed/wall/hybrisa/colony/hospital/reinforced/hull
-	hull = 1
+	hull = TRUE
 	icon_state = "strata_hull"
 	desc = "A thick and chunky metal wall that is, just by virtue of its placement and imposing presence, entirely indestructible."
 
@@ -1512,7 +1512,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	damage_cap = HEALTH_WALL_REINFORCED
 
 /turf/closed/wall/hybrisa/colony/engineering/reinforced/hull
-	hull = 1
+	hull = TRUE
 	icon_state = "strata_hull"
 	desc = "A thick and chunky metal wall that is, just by virtue of its placement and imposing presence, entirely indestructible."
 
@@ -1534,4 +1534,4 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	icon = 'icons/turf/walls/hybrisa_spaceport_walls.dmi'
 	icon_state = "hwall"
 	walltype = WALL_REINFORCED
-	hull = 1
+	hull = TRUE

code/modules/mob/living/carbon/xenomorph/attack_alien.dm

@@ -514,7 +514,7 @@
 	return XENO_ATTACK_ACTION
 
 /obj/structure/fence/electrified/attack_alien(mob/living/carbon/xenomorph/M)
-	if(src.electrified && !src.cut) //this is placeholder, needs to be updated
+	if(electrified && !cut) //this is placeholder, needs to be updated
 		electrocute_xenomorph(M)
 	. = ..()
 

code/modules/mob/living/simple_animal/friendly/rat.dm

@@ -25,27 +25,27 @@
 	min_oxy = 16 //Require atleast 16kPA oxygen
 	minbodytemp = 223 //Below -50 Degrees Celcius
 	maxbodytemp = 323 //Above 50 Degrees Celcius
-	universal_speak = 0
-	universal_understand = 1
+	universal_speak = FALSE
+	universal_understand = TRUE
 	holder_type = /obj/item/holder/rat
 
 /mob/living/simple_animal/rat/Life(delta_time)
 	..()
 	if(!stat && prob(speak_chance))
-		for(var/mob/M in view())
-			M << 'sound/effects/mousesqueek.ogg'
+		for(var/mob/cur_mob in view())
+			cur_mob << 'sound/effects/mousesqueek.ogg'
 
 	if(!ckey && stat == CONSCIOUS && prob(0.5))
 		set_stat(UNCONSCIOUS)
 		icon_state = "rat_[body_color]_sleep"
-		wander = 0
+		wander = FALSE
 		speak_chance = 0
 		//snuffles
 	else if(stat == UNCONSCIOUS)
 		if(ckey || prob(1))
 			set_stat(CONSCIOUS)
 			icon_state = "rat_[body_color]"
-			wander = 1
+			wander = TRUE
 		else if(prob(5))
 			INVOKE_ASYNC(src, PROC_REF(emote), "snuffles")
 
@@ -72,10 +72,10 @@
 		PF.flags_pass = PASS_FLAGS_CRAWLER
 
 /mob/living/simple_animal/rat/splat(mob/killer)
-	src.health = 0
-	src.set_stat(DEAD)
-	src.icon_dead = "rat_[body_color]_splat"
-	src.icon_state = "rat_[body_color]_splat"
+	health = 0
+	set_stat(DEAD)
+	icon_dead = "rat_[body_color]_splat"
+	icon_state = "rat_[body_color]_splat"
 	layer = ABOVE_LYING_MOB_LAYER
 	if(client)
 		client.time_died_as_mouse = world.time
@@ -89,11 +89,11 @@
 		if(!ckey && stat == UNCONSCIOUS)
 			set_stat(CONSCIOUS)
 			icon_state = "rat_[body_color]"
-			wander = 1
+			wander = TRUE
 		else if(!stat && prob(5))
-			var/mob/M = AM
-			to_chat(M, SPAN_NOTICE(" [icon2html(src, M)] Squeek!"))
-			M << 'sound/effects/mousesqueek.ogg'
+			var/mob/crossed_mob = AM
+			to_chat(crossed_mob, SPAN_NOTICE(" [icon2html(src, crossed_mob)] Squeek!"))
+			crossed_mob << 'sound/effects/mousesqueek.ogg'
 	..()
 
 /mob/living/simple_animal/rat/death()
@@ -111,8 +111,7 @@
 	if(H.a_intent == INTENT_HELP)
 		get_scooped(H)
 		return
-	else
-		return ..()
+	return ..()
 
 /mob/living/simple_animal/rat/get_scooped(mob/living/carbon/grabber)
 	if (stat >= DEAD)

colonialmarines.dme

@@ -2493,5 +2493,4 @@
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\_basemap.dm"
-#include "maps\map_files\LV759_Hybrisa_Prospera\LV759_Hybrisa_Prospera.dmm"
 // END_INCLUDE