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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

Browse Source 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
This commit is contained in:
Markolie
2017-01-31 17:44:38 +01:00
parent a653732219 50117386c3
commit 2b767bb9c9
48 changed files with 717 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/clothing.dm
+2 -1
View File
@@ -32,7 +32,8 @@
#define slot_r_ear 20
#define slot_wear_pda 21
#define slot_tie 22
#define slots_amt 22
#define slot_collar 23
#define slots_amt 23
//Cant seem to find a mob bitflags area other than the powers one