Bleeding edgy refresh (#303)

* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
+1 -1
View File
@@ -135,7 +135,7 @@
/obj/item/weapon/reagent_containers/food/snacks/egg/attack_self(mob/user)
..()
if(containsPrize)
user << "<span class='notice'>You unwrap the [src] and find a prize inside!</span>"
to_chat(user, "<span class='notice'>You unwrap the [src] and find a prize inside!</span>")
dispensePrize(get_turf(user))
containsPrize = FALSE
qdel(src)
+2 -2
View File
@@ -129,7 +129,7 @@
layer = 4
var/timer = 0
/mob/living/simple_animal/shade/howling_ghost/New()
/mob/living/simple_animal/shade/howling_ghost/Initialize()
..()
icon_state = pick("ghost","ghostian","ghostian2","ghostking","ghost1","ghost2")
icon_living = icon_state
@@ -193,7 +193,7 @@
unsuitable_atmos_damage = 0
var/timer
/mob/living/simple_animal/hostile/retaliate/clown/insane/New()
/mob/living/simple_animal/hostile/retaliate/clown/insane/Initialize()
..()
timer = rand(5,15)
status_flags = (status_flags | GODMODE)
+2 -2
View File
@@ -144,7 +144,7 @@
/datum/holiday/april_fools/celebrate()
if(ticker)
ticker.login_music = 'sound/ambience/clown.ogg'
for(var/mob/new_player/P in mob_list)
for(var/mob/dead/new_player/P in mob_list)
if(P.client)
P.stopLobbySound()
P.client.playtitlemusic()
@@ -421,5 +421,5 @@
begin_day += 31
begin_month-- //begins in march, ends in april
// world << "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]"
// to_chat(world, "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]")
return ..()