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
+11 -11
View File
@@ -41,19 +41,19 @@
return
if(!labels_left)
user << "<span class='warning'>No labels left!</span>"
to_chat(user, "<span class='warning'>No labels left!</span>")
return
if(!label || !length(label))
user << "<span class='warning'>No text set!</span>"
to_chat(user, "<span class='warning'>No text set!</span>")
return
if(length(A.name) + length(label) > 64)
user << "<span class='warning'>Label too big!</span>"
to_chat(user, "<span class='warning'>Label too big!</span>")
return
if(ishuman(A))
user << "<span class='warning'>You can't label humans!</span>"
to_chat(user, "<span class='warning'>You can't label humans!</span>")
return
if(issilicon(A))
user << "<span class='warning'>You can't label cyborgs!</span>"
to_chat(user, "<span class='warning'>You can't label cyborgs!</span>")
return
user.visible_message("[user] labels [A] as [label].", \
@@ -64,26 +64,26 @@
/obj/item/weapon/hand_labeler/attack_self(mob/user)
if(!user.IsAdvancedToolUser())
user << "<span class='warning'>You don't have the dexterity to use [src]!</span>"
to_chat(user, "<span class='warning'>You don't have the dexterity to use [src]!</span>")
return
mode = !mode
icon_state = "labeler[mode]"
if(mode)
user << "<span class='notice'>You turn on [src].</span>"
to_chat(user, "<span class='notice'>You turn on [src].</span>")
//Now let them chose the text.
var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
user << "<span class='warning'>Invalid text!</span>"
to_chat(user, "<span class='warning'>Invalid text!</span>")
return
label = str
user << "<span class='notice'>You set the text to '[str]'.</span>"
to_chat(user, "<span class='notice'>You set the text to '[str]'.</span>")
else
user << "<span class='notice'>You turn off [src].</span>"
to_chat(user, "<span class='notice'>You turn off [src].</span>")
/obj/item/weapon/hand_labeler/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/hand_labeler_refill))
user << "<span class='notice'>You insert [I] into [src].</span>"
to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
qdel(I)
labels_left = initial(labels_left) //Yes, it's capped at its initial value