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
+7 -7
View File
@@ -19,7 +19,7 @@
/obj/item/weapon/gun/magic/wand/examine(mob/user)
..()
user << "Has [charges] charge\s remaining."
to_chat(user, "Has [charges] charge\s remaining.")
/obj/item/weapon/gun/magic/wand/update_icon()
icon_state = "[initial(icon_state)][charges ? "" : "-drained"]"
@@ -37,7 +37,7 @@
if(no_den_usage)
var/area/A = get_area(user)
if(istype(A, /area/wizard_station))
user << "<span class='warning'>You know better than to violate the security of The Den, best wait until you leave to use [src].<span>"
to_chat(user, "<span class='warning'>You know better than to violate the security of The Den, best wait until you leave to use [src].<span>")
return
else
no_den_usage = 0
@@ -50,7 +50,7 @@
/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user)
user.visible_message("<span class='danger'>[user] zaps [user.p_them()]self with [src].</span>")
playsound(user, fire_sound, 50, 1)
user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> zapped [user.p_them()]self with a <b>[src]</b>"
user.log_message("zapped [user.p_them()]self with a <b>[src]</b>", INDIVIDUAL_ATTACK_LOG)
/////////////////////////////////////
@@ -67,9 +67,9 @@
/obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user)
..()
user << "<span class='warning'>You irradiate yourself with pure energy! \
to_chat(user, "<span class='warning'>You irradiate yourself with pure energy! \
[pick("Do not pass go. Do not collect 200 zorkmids.","You feel more confident in your spell casting skills.","You Die...","Do you want your possessions identified?")]\
</span>"
</span>")
user.adjustOxyLoss(500)
charges--
@@ -92,7 +92,7 @@
var/mob/living/carbon/C = user
C.regenerate_limbs()
C.regenerate_organs()
user << "<span class='notice'>You feel great!</span>"
to_chat(user, "<span class='notice'>You feel great!</span>")
charges--
..()
@@ -148,7 +148,7 @@
no_den_usage = 1
/obj/item/weapon/gun/magic/wand/door/zap_self(mob/living/user)
user << "<span class='notice'>You feel vaguely more open with your feelings.</span>"
to_chat(user, "<span class='notice'>You feel vaguely more open with your feelings.</span>")
charges--
..()