Tg 1 28 sync testing/confirmation (#5178)

* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
This commit is contained in:
Poojawa
2018-01-29 04:42:29 -06:00
committed by GitHub
parent 89fa4b0f28
commit 03086dfa91
666 changed files with 27177 additions and 35945 deletions
+8 -4
View File
@@ -28,8 +28,13 @@
pixel_y -= 8
U.add_overlay(src)
for(var/armor_type in armor)
U.armor[armor_type] += armor[armor_type]
if (islist(U.armor)) // This proc can run before /obj/Initialize has run for U and src,
U.armor = getArmor(arglist(U.armor)) // we have to check that the armor list has been transformed into a datum before we try to call a proc on it
// This is safe to do as /obj/Initialize only handles setting up the datum if actually needed.
if (islist(armor))
armor = getArmor(arglist(armor))
U.armor = U.armor.attachArmor(armor)
if(isliving(user))
on_uniform_equip(U, user)
@@ -42,8 +47,7 @@
pockets.forceMove(src)
U.pockets = null
for(var/armor_type in armor)
U.armor[armor_type] -= armor[armor_type]
U.armor = U.armor.detachArmor(armor)
if(isliving(user))
on_uniform_dropped(U, user)