diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
@@ -81,6 +81,9 @@ log transactions
 
 /obj/machinery/atm/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/card))
+		if(!powered())
+			return
+
 		if(!held_card)
 			user.drop_item()
 			I.forceMove(src)
@@ -91,6 +94,8 @@ log transactions
 	else if(authenticated_account)
 		if(istype(I, /obj/item/stack/spacecash))
 			//consume the money
+			if(!powered())
+				return
 			var/obj/item/stack/spacecash/C = I
 			authenticated_account.money += C.amount
 			playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 50, 1)
@@ -118,7 +123,7 @@ log transactions
 		to_chat(user, "<span class='warning'>Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005.</span>")
 		return
 	ui_interact(user)
-	
+
 /obj/machinery/atm/attack_ghost(mob/user)
 	ui_interact(user)
 
@@ -344,4 +349,4 @@ log transactions
 					authenticated_account.transaction_log.Add(T)
 
 					view_screen = NO_SCREEN
-					nanomanager.update_uis(src)
+					nanomanager.update_uis(src)
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
@@ -562,7 +562,7 @@
 
 /obj/item/device/wormhole_jaunter/attack_self(mob/user)
 	var/turf/device_turf = get_turf(user)
-	if(!device_turf||is_teleport_allowed(device_turf.z))
+	if(!device_turf || !is_teleport_allowed(device_turf.z))
 		to_chat(user, "<span class='notice'>You're having difficulties getting the [src.name] to work.</span>")
 		return
 	else

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
@@ -245,7 +245,7 @@
 					wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a robotic [E.name]!\n"
 
 				else if(E.status & ORGAN_SPLINTED)
-					wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a splint on his [E.name]!\n"
+					wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a splint on [t_his] [E.name]!\n"
 
 			for(var/obj/item/I in E.embedded_objects)
 				msg += "<B>[t_He] [t_has] \a [bicon(I)] [I] embedded in [t_his] [E.name]!</B>\n"

diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
@@ -188,7 +188,7 @@
 			switch(progress)
 				if(1)
 					to_chat(user, "<span class='notice'>You begin by introducing yourself and explaining what you're about.</span>")
-					user.visible_message("<span class='danger'>[user]'s introduces himself and explains his plans.</span>")
+					user.visible_message("<span class='danger'>[user]'s introduces \himself and explains \his plans.</span>")
 				if(2)
 					to_chat(user, "<span class='notice'>You begin the recruitment of [target].</span>")
 					user.visible_message("<span class='danger'>[user] leans over towards [target], whispering excitedly as he gives a speech.</span>")
@@ -214,7 +214,7 @@
 		recruiting = 0
 		to_chat(user, "<span class='notice'>You have recruited <b>[target]</b> as your henchman!</span>")
 		to_chat(target, "<span class='deadsay'><b>You have decided to enroll as a henchman for [user]. You are now part of the feared 'Greyshirts'.</b></span>")
-		to_chat(target, "<span class='deadsay'><b>You must follow the orders of [user], and help him succeed in his dastardly schemes.</span>")
+		to_chat(target, "<span class='deadsay'><b>You must follow the orders of [user], and help him succeed in \his dastardly schemes.</span>")
 		to_chat(target, "<span class='deadsay'>You may not harm other Greyshirt or [user]. However, you do not need to obey other Greyshirts.</span>")
 		ticker.mode.greyshirts += target.mind
 		target.set_species("Human")

diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -0,0 +1,61 @@
+//Penguins
+
+/mob/living/simple_animal/pet/penguin
+	name = "penguin"
+	real_name = "penguin"
+	response_help  = "pets"
+	response_disarm = "bops"
+	response_harm   = "kicks"
+	speak = list("Gah Gah!", "NOOT NOOT!", "NOOT!", "Noot", "noot", "Prah!", "Grah!")
+	speak_emote = list("squawks", "gakkers")
+	emote_hear = list("squawk!", "gakkers!", "noots.","NOOTS!")
+	emote_see = list("shakes its beak.", "flaps it's wings.","preens itself.")
+	faction = list("penguin")
+	see_in_dark = 5
+	speak_chance = 1
+	turns_per_move = 10
+	icon = 'icons/mob/penguins.dmi'
+
+/mob/living/simple_animal/pet/penguin/emperor
+	name = "Emperor penguin"
+	real_name = "penguin"
+	desc = "Emperor of all he surveys."
+	icon_state = "penguin"
+	icon_living = "penguin"
+	icon_dead = "penguin_dead"
+	butcher_results = list()
+	gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
+
+/mob/living/simple_animal/pet/penguin/eldrich
+	name = "Albino penguin"
+	real_name = "penguin"
+	desc = "Found in the depths of mountains."
+	response_help  = "taps"
+	response_disarm = "pokes"
+	response_harm   = "flails at"
+	icon_state = "penguin_elder"
+	icon_living = "penguin_elder"
+	icon_dead = "penguin_dead"
+	speak = list("Gah Gah!", "Tekeli-li! Tekeli-li!", "Tekeli-li!", "Teke", "li")
+	speak_emote = list("gibbers", "gakkers")
+	emote_hear = list("whistles!", "gakkers!")
+	emote_see = list("shakes its beak.", "flaps it's wings.","preens itself.")
+	faction = list("penguin", "cult")
+
+/mob/living/simple_animal/pet/penguin/emperor/shamebrero
+	name = "Shamebrero penguin"
+	desc = "Shameful of all he surveys."
+	icon_state = "penguin_shamebrero"
+	icon_living = "penguin_shamebrero"
+
+/mob/living/simple_animal/pet/penguin/baby
+	speak = list("gah", "noot noot", "noot!", "noot", "squeee!", "noo!")
+	name = "Penguin chick"
+	real_name = "penguin"
+	desc = "Can't fly and can barely waddles, but the prince of all chicks."
+	icon_state = "penguin_baby"
+	icon_living = "penguin_baby"
+	icon_dead = "penguin_baby_dead"
+	density = FALSE
+	pass_flags = PASSMOB
+	mob_size = MOB_SIZE_SMALL
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
@@ -326,7 +326,7 @@
 	var/eye_colour = "#000000"
 	var/list/colourmatrix = null
 	var/list/colourblind_matrix = MATRIX_GREYSCALE //Special colourblindness parameters. By default, it's black-and-white.
-	var/colourblind_darkview = null
+//	var/colourblind_darkview = null
 	var/dependent_disabilities = null //Gets set by eye-dependent disabilities such as colourblindness so the eyes can transfer the disability during transplantation.
 	var/dark_view = 2 //Default dark_view for Humans.
 	var/weld_proof = null //If set, the eyes will not take damage during welding. eg. IPC optical sensors do not take damage when they weld things while all other eyes will.
@@ -341,10 +341,10 @@
 		return colourmatrix
 
 /obj/item/organ/internal/eyes/proc/get_dark_view() //Returns dark_view (if the eyes are organic) for see_invisible handling in species.dm to be autoprocessed by life().
-	if(!robotic && colourblind_darkview && owner.disabilities & COLOURBLIND) //Returns special darkview value if colourblind and it exists, otherwise reuse current.
+	/*if(!robotic && colourblind_darkview && owner.disabilities & COLOURBLIND) //Returns special darkview value if colourblind and it exists, otherwise reuse current.
 		return colourblind_darkview
-	else
-		return dark_view
+	else*/
+	return dark_view
 
 /obj/item/organ/internal/eyes/insert(mob/living/carbon/human/M, special = 0)
 	..()

diff --git a/code/modules/surgery/organs/subtypes/tajaran.dm b/code/modules/surgery/organs/subtypes/tajaran.dm
@@ -3,11 +3,11 @@
 	species = "Tajaran"
 
 /obj/item/organ/internal/eyes/tajaran /*Most Tajara see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
-										unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
+										unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/  //FYI THIS COMMENT WAS REMOVED IN PARACODE AND PROBABLY ISN'T TRUE JUST SAIYAN  -- LZ
 	name = "tajaran eyeballs"
 	species = "Tajaran"
 	colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
-	colourblind_darkview = 8
+	dark_view = 8
 
 /obj/item/organ/internal/eyes/tajaran/farwa //Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness.
 	name = "farwa eyeballs"

diff --git a/code/modules/surgery/organs/subtypes/vulpkanin.dm b/code/modules/surgery/organs/subtypes/vulpkanin.dm
@@ -2,15 +2,15 @@
 	alcohol_intensity = 1.4
 	species = "Vulpkanin"
 
-/obj/item/organ/internal/eyes/vulpkanin /*Most Vulpkanin see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
-										  unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
+
+/obj/item/organ/internal/eyes/vulpkanin
 	name = "vulpkanin eyeballs"
 	species = "Vulpkanin"
-	colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
-	colourblind_darkview = 8
+	colourblind_matrix = MATRIX_VULP_CBLIND
+	dark_view = 8
 
 /obj/item/organ/internal/eyes/vulpkanin/wolpin //Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness.
 	name = "wolpin eyeballs"
 	species = "Wolpin"
 	colourmatrix = MATRIX_VULP_CBLIND
-	dark_view = 8
+	dark_view = 8
diff --git a/icons/mob/penguins.dmi b/icons/mob/penguins.dmi
diff --git a/terrastation.dme b/terrastation.dme
@@ -1722,6 +1722,7 @@
 #include "code\modules\mob\living\simple_animal\friendly\fox.dm"
 #include "code\modules\mob\living\simple_animal\friendly\lizard.dm"
 #include "code\modules\mob\living\simple_animal\friendly\mouse.dm"
+#include "code\modules\mob\living\simple_animal\friendly\penguin.dm"
 #include "code\modules\mob\living\simple_animal\friendly\pet.dm"
 #include "code\modules\mob\living\simple_animal\friendly\pug.dm"
 #include "code\modules\mob\living\simple_animal\friendly\slime.dm"