cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict Fix

Browse Source 
Conflicts:
	icons/mob/suit.dmi
This commit is contained in:
SamCroswell
2015-03-08 20:38:07 -04:00
parent 8829a90709 7fda1b1fd5
commit 8477d382a7
24 changed files with 417 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/vox_raiders.dm
+1 -1
View File
@@ -8,7 +8,7 @@ var/global/vox_tick = 1
equip_to_slot_or_del(new /obj/item/clothing/under/vox/vox_robes(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(src), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow/vox(src), slot_gloves) // AS ABOVE.
equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow/vox(src), slot_gloves) // AS ABOVE.
switch(vox_tick)
if(1) // Vox raider!