can i sleep uyet

This commit is contained in:
Aurorablade
2016-02-03 00:40:10 -05:00
parent 6001f3d80c
commit 0fc841f0f9
6 changed files with 10 additions and 17 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/gun/energy/gun/advtaser/mounted
/obj/item/weapon/gun/energy/advtaser/mounted
name = "mounted taser"
desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
icon_state = "armcannonstun"
@@ -11,7 +11,7 @@
w_class = 5.0
can_flashlight = 0
/obj/item/weapon/gun/energy/gun/advtaser/mounted/dropped()//if somebody manages to drop this somehow...
/obj/item/weapon/gun/energy/advtaser/mounted/dropped()//if somebody manages to drop this somehow...
src.loc = null//send it to nullspace to get retrieved by the implant later on. gotta cover those edge cases.
/obj/item/weapon/gun/energy/laser/mounted
+2 -2
View File
@@ -8,7 +8,7 @@
H = M
affecting = H.get_organ(check_zone(selected_zone))
if(can_operate(H) || isslime(M) ||isalien(M)) //if they're prone or a slime
if(isslime(M) ||isalien(M) ||can_operate(H)) //if they're prone or a slime
var/datum/surgery/current_surgery
for(var/datum/surgery/S in M.surgeries)
@@ -56,7 +56,7 @@
"<span class='notice'>You prepare to operate on [M]'s [parse_zone(selected_zone)].</span>")
else if(!current_surgery.step_in_progress)
if(current_surgery.status == 0 || current_surgery.status == 1 )
if(current_surgery.status == 1 )
M.surgeries -= current_surgery
user << "You stop the surgery."
qdel(current_surgery)
-9
View File
@@ -13,8 +13,6 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
return 0
if(affected && (affected.status && ORGAN_DESTROYED))
return 0
if(affected.is_stump())
@@ -32,9 +30,6 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
return 1
if(affected && (affected.status && ORGAN_DESTROYED))
return 1
if(affected.is_stump())
@@ -51,10 +46,6 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
return 1
if(affected && (affected.status && ORGAN_DESTROYED))
return 1
if(affected.is_stump())
@@ -350,17 +350,18 @@
M.mutations.Add(CLUMSY)
M.dna.SetSEState(COMICBLOCK,1,1)
//genemutcheck(H,COMICBLOCK,null,MUTCHK_FORCED)
genemutcheck(M,COMICBLOCK,null,MUTCHK_FORCED)
/obj/item/organ/internal/honktumor/remove(mob/living/carbon/M, special = 0)
M.mutations.Remove(CLUMSY)
M.mutations.Remove(COMICBLOCK)
//genemutcheck(H,COMICBLOCK,null,MUTCHK_FORCED)
genemutcheck(M,COMICBLOCK,null,MUTCHK_FORCED)
/obj/item/organ/internal/honktumor/on_life()
if(!owner)
return
world << "[lasthonk]"
if(lasthonk == 0)
lasthonk = world.time
if(lasthonk > world.time + 600|| lasthonk == 0)
+1 -2
View File
@@ -12,8 +12,7 @@
/datum/surgery/organ_manipulation/boneless
possible_locs = list("chest","head","groin", "eyes", "mouth")
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/internal/manipulate_organs,/datum/surgery_step/generic/cauterize)
allowed_mob = list(/mob/living/carbon/human/diona,/mob/living/carbon/human/slime)
disallowed_mob = list(/mob/living/carbon/human)
allowed_mob = list(/mob/living/carbon/human/diona)
/datum/surgery/organ_manipulation/alien
name = "alien organ manipulation"