Skip to content

Commit

Permalink
Removed zombies, added Skellingtons for halloween. Some bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ZomgPonies committed Oct 31, 2013
1 parent 11b2fb2 commit a227fa6
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 733 deletions.
1 change: 0 additions & 1 deletion baystation12.dme
Expand Up @@ -971,7 +971,6 @@
#include "code\modules\mob\living\carbon\monkey\monkey.dm"
#include "code\modules\mob\living\carbon\monkey\powers.dm"
#include "code\modules\mob\living\carbon\monkey\update_icons.dm"
#include "code\modules\mob\living\carbon\zombie\zombie.dm"
#include "code\modules\mob\living\silicon\death.dm"
#include "code\modules\mob\living\silicon\login.dm"
#include "code\modules\mob\living\silicon\say.dm"
Expand Down
1 change: 0 additions & 1 deletion code/modules/admin/admin_verbs.dm
Expand Up @@ -92,7 +92,6 @@ var/list/admin_verbs_fun = list(
/datum/admins/proc/toggle_aliens,
/datum/admins/proc/toggle_space_ninja,
/client/proc/send_space_ninja,
/client/proc/zombie_event, // ZOMBB-B-BIES
/client/proc/cmd_admin_add_freeform_ai_law,
/client/proc/cmd_admin_add_random_ai_law,
/client/proc/make_sound,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences.dm
Expand Up @@ -841,7 +841,7 @@ datum/preferences
age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)
if("species")

var/list/new_species = list("Human","Tajaran","Skrell","Unathi","Diona")
var/list/new_species = list("Human","Tajaran","Skrell","Unathi","Diona","Skellington")
var/prev_species = species
// var/whitelisted = 0

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mining/machine_stacking.dm
Expand Up @@ -95,7 +95,7 @@
storage.amount += inp.amount //Stack the sheets
inp.loc = null //Let the old sheet garbage collect
while(storage.amount > stack_amt) //Get rid of excessive stackage
var/obj/item/stack/sheet/out = new input.type()
var/obj/item/stack/sheet/out = new inp.type()
out.amount = stack_amt
out.loc = output.loc
storage.amount -= stack_amt
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/species.dm
Expand Up @@ -149,7 +149,7 @@
language = "Clatter"
attack_verb = "punch"

flags = WHITELISTED | HAS_LIPS | HAS_TAIL | NO_EAT | NO_BREATHE | NON_GENDERED
flags = HAS_LIPS | HAS_TAIL | NO_EAT | NO_BREATHE | NON_GENDERED



Expand Down

0 comments on commit a227fa6

Please sign in to comment.