shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modular_citadel

Browse Source
This commit is contained in:
LetterJay
2018-05-20 23:04:13 -05:00
parent a0b6b4e7d8
commit 1e207a7430
26 changed files with 282 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/highlander/highlander.dm
-8
View File
@@ -46,19 +46,11 @@
qdel(I)
for(var/obj/item/I in H.held_items)
qdel(I)
<<<<<<< HEAD
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt/highlander(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), slot_ears)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/pinpointer/nuke(H), slot_l_store)
=======
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt/highlander(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_EARS)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_SHOES)
H.equip_to_slot_or_del(new /obj/item/pinpointer/nuke(H), SLOT_L_STORE)
>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
for(var/obj/item/pinpointer/nuke/P in H)
P.attack_self(H)
var/obj/item/card/id/W = new(H)