From ca17950b17aacc0f8bd24380c7c092a3e57bec1d Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Thu, 18 Dec 2014 23:27:04 +0000 Subject: [PATCH 1/2] Woops --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 38ef264b..6d81acee 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -89,7 +89,7 @@ prev_gender = gender // Debug for plural genders make_blood() -/* + /mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes) if ((!( yes ) || now_pushing)) return @@ -177,7 +177,7 @@ return return -*/ + /mob/living/carbon/human/Stat() ..() statpanel("Status") From 76fde80db92508c8d8551866e0103b8cb67a4443 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Fri, 19 Dec 2014 00:53:39 +0000 Subject: [PATCH 2/2] Slime Surgery --- aurora.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/aurora.dme b/aurora.dme index 8efc4175..c4a6d612 100644 --- a/aurora.dme +++ b/aurora.dme @@ -1434,6 +1434,7 @@ #include "code\modules\surgery\organs_internal.dm" #include "code\modules\surgery\other.dm" #include "code\modules\surgery\robolimbs.dm" +#include "code\modules\surgery\slimes.dm" #include "code\modules\surgery\surgery.dm" #include "code\modules\telesci\bscrystal.dm" #include "code\modules\telesci\gps.dm"