Merge branch 'master' into development

This commit is contained in:
skull132
2016-07-10 14:25:54 -04:00
42 changed files with 335 additions and 253 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ var/global/datum/robolimb/basic_robolimb
icon = 'icons/mob/human_races/cyberlimbs/bishop.dmi'
/datum/robolimb/hesphaistos
company = "Hesphiastos Industries"
company = "Hephaestus Industries"
desc = "This limb has a militaristic black and green casing with gold stripes."
icon = 'icons/mob/human_races/cyberlimbs/hesphaistos.dmi'