cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate

Browse Source 
Conflicts:
	code/modules/clothing/clothing.dm
This commit is contained in:
Zuhayr
2015-08-22 03:17:16 +09:30
parent bf313ae238 a7f452416e
commit 56131e1053
21 changed files with 141 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/paintkit.dm
+2 -2
View File
@@ -43,7 +43,7 @@
user << "You set about modifying the helmet into [src]."
var/mob/living/carbon/human/H = user
if(istype(H))
species_restricted = list(H.species.name)
species_restricted = list(H.species.get_bodytype())
kit.use(1,user)
return 1
return ..()
@@ -62,7 +62,7 @@
user << "You set about modifying the suit into [src]."
var/mob/living/carbon/human/H = user
if(istype(H))
species_restricted = list(H.species.name)
species_restricted = list(H.species.get_bodytype())
kit.use(1,user)
return 1
return ..()