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 -6
View File
@@ -13,7 +13,7 @@
var/obj/item/weapon/paper/internalPaper
/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/newPaper)
/obj/item/weapon/paperplane/Initialize(mapload, obj/item/weapon/paper/newPaper)
..()
pixel_y = rand(-8, 8)
pixel_x = rand(-9, 9)
@@ -48,8 +48,9 @@
add_overlay(stampoverlay)
/obj/item/weapon/paperplane/attack_self(mob/user)
user << "<span class='notice'>You unfold [src].</span>"
var/internal_paper_tmp = internalPaper
to_chat(user, "<span class='notice'>You unfold [src].</span>")
var/atom/movable/internal_paper_tmp = internalPaper
internal_paper_tmp.forceMove(loc)
internalPaper = null
qdel(src)
user.put_in_hands(internal_paper_tmp)
@@ -57,7 +58,7 @@
/obj/item/weapon/paperplane/attackby(obj/item/weapon/P, mob/living/carbon/human/user, params)
..()
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
user << "<span class='notice'>You should unfold [src] before changing it.</span>"
to_chat(user, "<span class='notice'>You should unfold [src] before changing it.</span>")
return
else if(istype(P, /obj/item/weapon/stamp)) //we don't randomize stamps on a paperplane
@@ -102,9 +103,9 @@
if ( istype(user) )
if( (!in_range(src, user)) || user.stat || user.restrained() )
return
user << "<span class='notice'>You fold [src] into the shape of a plane!</span>"
to_chat(user, "<span class='notice'>You fold [src] into the shape of a plane!</span>")
user.temporarilyRemoveItemFromInventory(src)
I = new /obj/item/weapon/paperplane(user, src)
user.put_in_hands(I)
else
user << "<span class='notice'> You lack the dexterity to fold \the [src]. </span>"
to_chat(user, "<span class='notice'> You lack the dexterity to fold \the [src]. </span>")