my eyes hurt

This commit is contained in:
LetterJay
2017-08-22 01:42:20 -05:00
parent 2241f5ecfb
commit b01a24c95b
215 changed files with 609 additions and 609 deletions
@@ -35,7 +35,6 @@
/obj/item/weapon/twohanded/ctf/Initialize()
. = ..()
SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
if(!reset)
reset = new reset_path(get_turf(src))
@@ -474,14 +473,14 @@
W.registered_name = H.real_name
W.update_label(W.registered_name, W.assignment)
// The shielded hardsuit is already NODROP
// The shielded hardsuit is already NODROP_1
no_drops += H.get_item_by_slot(slot_gloves)
no_drops += H.get_item_by_slot(slot_shoes)
no_drops += H.get_item_by_slot(slot_w_uniform)
no_drops += H.get_item_by_slot(slot_ears)
for(var/i in no_drops)
var/obj/item/I = i
I.flags |= NODROP
I.flags_1 |= NODROP_1
/datum/outfit/ctf/instagib
r_hand = /obj/item/weapon/gun/energy/laser/instakill
@@ -533,6 +532,7 @@
var/team = WHITE_TEAM
time_between_triggers = 1
anchored = TRUE
flags_2 = SLOWS_WHILE_IN_HAND_2
alpha = 255
/obj/structure/trap/examine(mob/user)