Merge pull request #710 from ZomgPonies/limb

Port of the BS12 limb overhaul
This commit is contained in:
Fox-McCloud
2015-04-05 19:06:39 -04:00
149 changed files with 3451 additions and 2530 deletions

View File

@@ -596,6 +596,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
for (var/obj/item/I in M)
if (istype(I, /obj/item/weapon/implant))
continue
if(istype(I, /obj/item/organ))
continue
del(I)
switch(dresscode)
if ("strip")

View File

@@ -526,11 +526,11 @@ client/proc/one_click_antag()
new_vox.h_style = "Short Vox Quills"
new_vox.f_style = "Shaved"
for(var/datum/organ/external/limb in new_vox.organs)
for(var/obj/item/organ/external/limb in new_vox.organs)
limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
//Now apply cortical stack.
var/datum/organ/external/E = new_vox.get_organ("head")
var/obj/item/organ/external/E = new_vox.get_organ("head")
var/obj/item/weapon/implant/cortical/I = new(new_vox)
I.imp_in = new_vox
I.implanted = 1

View File

@@ -30,6 +30,8 @@
for (var/obj/item/I in H)
if (istype(I, /obj/item/weapon/implant))
continue
if(istype(I, /obj/item/organ))
continue
del(I)
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(H), slot_w_uniform)

View File

@@ -15,6 +15,8 @@
for (var/obj/item/I in H)
if (istype(I, /obj/item/weapon/implant))
continue
if(istype (I, /obj/item/organ))
continue
del(I)
H << "<B>You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.</B>"

View File

@@ -65,7 +65,7 @@ var/global/vox_tick = 1
var/obj/item/weapon/implant/cortical/I = new(src)
I.imp_in = src
I.implanted = 1
var/datum/organ/external/affected = src.get_organ("head")
var/obj/item/organ/external/affected = src.get_organ("head")
affected.implants += I
I.part = affected