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
+1 -1
View File
@@ -419,7 +419,7 @@
desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
ammo_type = list(/obj/item/ammo_casing/energy/chameleon)
clumsy_check = 0
needs_permit = 0
item_flags = NONE
pin = /obj/item/device/firing_pin
cell_type = /obj/item/stock_parts/cell/bluespace
+1 -1
View File
@@ -45,7 +45,7 @@
/obj/item/clothing/glasses/proc/thermal_overload()
if(ishuman(src.loc))
var/mob/living/carbon/human/H = src.loc
if(!(H.has_disability(DISABILITY_BLIND)))
if(!(H.has_trait(TRAIT_BLIND)))
if(H.glasses == src)
to_chat(H, "<span class='danger'>[src] overloads and blinds you!</span>")
H.flash_act(visual = 1)
+4 -4
View File
@@ -17,15 +17,15 @@
H.remove_hud_from(user)
/obj/item/clothing/glasses/hud/emp_act(severity)
if(emagged)
if(obj_flags & EMAGGED)
return
emagged = TRUE
obj_flags |= EMAGGED
desc = "[desc] The display is flickering slightly."
/obj/item/clothing/glasses/hud/emag_act(mob/user)
if(emagged)
if(obj_flags & EMAGGED)
return
emagged = TRUE
obj_flags |= EMAGGED
to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
desc = "[desc] The display is flickering slightly."
+1 -1
View File
@@ -66,7 +66,7 @@
var/obj/item/organ/heart/heart = M.getorganslot(ORGAN_SLOT_HEART)
var/obj/item/organ/lungs/lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
if(!(M.stat == DEAD || (M.status_flags&FAKEDEATH)))
if(!(M.stat == DEAD || (M.has_trait(TRAIT_FAKEDEATH))))
if(heart && istype(heart))
heart_strength = "<span class='danger'>an unstable</span>"
if(heart.beating)
@@ -435,7 +435,7 @@
var/nopass = FALSE
if(!A.density)
return TRUE
nopass = (A.locked || A.stat || A.emagged || A.welded)
nopass = (A.locked || A.stat || (A.obj_flags & EMAGGED) || A.welded)
if(A.requiresID())
if((!A.allowed(wearer)) && !A.emergency)
nopass = TRUE
+2 -1
View File
@@ -7,6 +7,7 @@
slot_flags = SLOT_OCLOTHING
var/blood_overlay_type = "suit"
var/togglename = null
var/suittoggled = FALSE
/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
@@ -28,4 +29,4 @@
..()
if(ismob(loc))
var/mob/M = loc
M.update_inv_wear_suit()
M.update_inv_wear_suit()
-1
View File
@@ -4,7 +4,6 @@
actions_types = list(/datum/action/item_action/toggle_hood)
var/obj/item/clothing/head/hooded/hood
var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this
hooded = 1
/obj/item/clothing/suit/hooded/New()
MakeHood()
+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)