From ab0e0667f2c5a667a45f50a3ecbd61c757c9ee91 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Wed, 31 Jan 2018 18:11:19 -0600 Subject: [PATCH] Makes Travis happy --- _maps/cit_map_files/BoxStation/BoxStation.dmm | 3 --- code/modules/mob/living/carbon/human/human.dm | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/_maps/cit_map_files/BoxStation/BoxStation.dmm b/_maps/cit_map_files/BoxStation/BoxStation.dmm index 339ac253b2..779d4e4a90 100644 --- a/_maps/cit_map_files/BoxStation/BoxStation.dmm +++ b/_maps/cit_map_files/BoxStation/BoxStation.dmm @@ -2688,7 +2688,6 @@ areastring = "/area/security/warden"; dir = 1; name = "Brig Control APC"; - pixel_x = 0; pixel_y = 24 }, /turf/open/floor/plasteel/showroomfloor, @@ -58364,7 +58363,6 @@ "QsG" = ( /obj/machinery/flasher{ id = "brigentry"; - pixel_x = 0; pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -59064,7 +59062,6 @@ dir = 8; name = "Security Checkpoint APC"; pixel_x = -24; - pixel_y = 0 }, /obj/structure/cable{ icon_state = "0-4" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 79aa49aeb1..48b1c6b6b8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1033,6 +1033,7 @@ /mob/living/carbon/human/species/zombie/krokodil_addict race = /datum/species/krokodil_addict +/* //CITADEL EDIT - TODO: Enable people to set custom races /mob/living/carbon/human/species/mammal race = /datum/species/mammal @@ -1045,4 +1046,4 @@ /mob/living/carbon/human/species/xeno race = /datum/species/xeno /mob/living/carbon/human/species/guilmon - race = /datum/species/guilmon + race = /datum/species/guilmon */