shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-26386

Browse Source
This commit is contained in:
LetterJay
2017-05-01 15:27:25 -05:00
committed by GitHub
parent 161891e51b 1842665af6
commit b57a4aa6b4
267 changed files with 15247 additions and 8768 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organ_manipulation.dm
+19 -3
View File
@@ -24,7 +24,7 @@
/datum/surgery_step/manipulate_organs
time = 64
name = "manipulate organs"
implements = list(/obj/item/organ = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0)
implements = list(/obj/item/organ = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0, /obj/item/weapon/organ_storage = 100)
var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/crowbar = 55)
var/implements_mend = list(/obj/item/weapon/cautery = 100, /obj/item/weapon/weldingtool = 70, /obj/item/weapon/lighter = 45, /obj/item/weapon/match = 20)
var/current_type
@@ -55,6 +55,15 @@
/datum/surgery_step/manipulate_organs/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
I = null
if(istype(tool, /obj/item/weapon/organ_storage))
if(!tool.contents.len)
to_chat(user, "<span class='notice'>There is nothing inside [tool]!</span>")
return -1
I = tool.contents[1]
if(!isorgan(I))
to_chat(user, "<span class='notice'>You cannot put [I] into [target]'s [parse_zone(target_zone)]!</span>")
return -1
tool = I
if(isorgan(tool))
current_type = "insert"
I = tool
@@ -74,7 +83,7 @@
"<span class='notice'>You begin to extract [B] from [target]'s [parse_zone(target_zone)]...</span>")
return TRUE
if(!organs.len)
to_chat(user, "<span class='notice'>There is no removeable organs in [target]'s [parse_zone(target_zone)]!</span>")
to_chat(user, "<span class='notice'>There are no removeable organs in [target]'s [parse_zone(target_zone)]!</span>")
return -1
else
for(var/obj/item/organ/O in organs)
@@ -108,7 +117,14 @@
target.heal_bodypart_damage(45,0)
return 1
else if(current_type == "insert")
I = tool
if(istype(tool, /obj/item/weapon/organ_storage))
I = tool.contents[1]
tool.icon_state = "evidenceobj"
tool.desc = "A container for holding body parts."
tool.cut_overlays()
tool = I
else
I = tool
user.drop_item()
I.Insert(target)
user.visible_message("[user] inserts [tool] into [target]'s [parse_zone(target_zone)]!",
code/modules/surgery/organs/ears.dm
+1 -1
View File
@@ -22,7 +22,7 @@
if(C.disabilities & DEAF)
deaf = max(deaf, 1)
else
if(HAS_SECONDARY_FLAG(C.ears, HEALS_EARS))
if(C.ears && HAS_SECONDARY_FLAG(C.ears, HEALS_EARS))
deaf = max(deaf - 1, 1)
ear_damage = max(ear_damage - 0.10, 0)
// if higher than UNHEALING_EAR_DAMAGE, no natural healing occurs.
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -39,7 +39,7 @@
M.internal_organs -= src
if(M.internal_organs_slot[slot] == src)
M.internal_organs_slot.Remove(slot)
if(vital && !special)
if(vital && !special && !(M.status_flags & GODMODE))
M.death()
for(var/X in actions)
var/datum/action/A = X
code/modules/surgery/organs/vocal_cords.dm
+2 -11
View File
@@ -175,7 +175,7 @@
var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt")
var/static/regex/weaken_words = regex("drop|fall|trip|weaken")
var/static/regex/sleep_words = regex("sleep|slumber")
var/static/regex/sleep_words = regex("sleep|slumber|rest")
var/static/regex/vomit_words = regex("vomit|throw up")
var/static/regex/silence_words = regex("shut up|silence|ssh|quiet|hush")
var/static/regex/hallucinate_words = regex("see the truth|hallucinate")
@@ -206,7 +206,6 @@
var/static/regex/throwmode_words = regex("throw|catch")
var/static/regex/flip_words = regex("flip|rotate|revolve|roll|somersault")
var/static/regex/speak_words = regex("speak|say something")
var/static/regex/rest_words = regex("rest")
var/static/regex/getup_words = regex("get up")
var/static/regex/sit_words = regex("sit")
var/static/regex/stand_words = regex("stand")
@@ -443,17 +442,9 @@
L.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"))
sleep(5) //So the chat flows more naturally
//REST
else if((findtext(message, rest_words)))
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
if(!L.resting)
L.lay_down()
//GET UP
else if((findtext(message, getup_words)))
cooldown = COOLDOWN_DAMAGE
cooldown = COOLDOWN_DAMAGE //because stun removal
for(var/V in listeners)
var/mob/living/L = V
if(L.resting)
code/modules/surgery/prosthetic_replacement.dm
+15 -1
View File
@@ -16,11 +16,20 @@
/datum/surgery_step/add_prosthetic
name = "add prosthetic"
implements = list(/obj/item/bodypart = 100, /obj/item/weapon/twohanded/required/chainsaw = 100, /obj/item/weapon/melee/synthetic_arm_blade = 100)
implements = list(/obj/item/bodypart = 100, /obj/item/weapon/organ_storage = 100, /obj/item/weapon/twohanded/required/chainsaw = 100, /obj/item/weapon/melee/synthetic_arm_blade = 100)
time = 32
var/organ_rejection_dam = 0
/datum/surgery_step/add_prosthetic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(istype(tool, /obj/item/weapon/organ_storage))
if(!tool.contents.len)
to_chat(user, "<span class='notice'>There is nothing inside [tool]!</span>")
return -1
var/obj/item/I = tool.contents[1]
if(!isbodypart(I))
to_chat(user, "<span class='notice'>[I] cannot be attached!</span>")
return -1
tool = I
if(istype(tool, /obj/item/bodypart))
var/obj/item/bodypart/BP = tool
if(ismonkey(target))// monkey patient only accept organic monkey limbs
@@ -49,6 +58,11 @@
return -1
/datum/surgery_step/add_prosthetic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(istype(tool, /obj/item/weapon/organ_storage))
tool.icon_state = "evidenceobj"
tool.desc = "A container for holding body parts."
tool.cut_overlays()
tool = tool.contents[1]
if(istype(tool, /obj/item/bodypart))
var/obj/item/bodypart/L = tool
user.drop_item()
code/modules/surgery/surgery.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm (rejected hunks)
@@ -54,7 +54,7 @@
return new step_type
/datum/surgery/proc/complete()
- feedback_add_details("surgeries_completed", type)
+ feedback_add_details("surgeries_completed", "[type]")
qdel(src)
code/modules/surgery/tools.dm
+54 -1
View File
@@ -97,4 +97,57 @@
/obj/item/weapon/surgical_drapes/attack(mob/living/M, mob/user)
if(!attempt_initiate_surgery(src, M, user))
..()
..()
/obj/item/weapon/organ_storage //allows medical cyborgs to manipulate organs without hands
name = "organ storage bag"
desc = "A container for holding body parts."
icon = 'icons/obj/storage.dmi'
icon_state = "evidenceobj"
/obj/item/weapon/organ_storage/afterattack(obj/item/I, mob/user, proximity)
if(!proximity)
return
if(contents.len)
to_chat(user, "<span class='notice'>[src] already has something inside it.</span>")
return
if(isorgan(I))
var/obj/item/organ/O = I
if(O.status != ORGAN_ORGANIC)
to_chat(user, "<span class='notice'>[src] can only hold organic body parts!</span>")
return
else if(isbodypart(I))
var/obj/item/bodypart/BP = I
if(BP.status != BODYPART_ORGANIC)
to_chat(user, "<span class='notice'>[src] can only hold organic body parts!</span>")
return
else
return
user.visible_message("[user] puts [I] into [src].", "<span class='notice'>You put [I] inside [src].</span>")
icon_state = "evidence"
var/xx = I.pixel_x
var/yy = I.pixel_y
I.pixel_x = 0
I.pixel_y = 0
var/image/img = image("icon"=I, "layer"=FLOAT_LAYER)
img.plane = FLOAT_PLANE
I.pixel_x = xx
I.pixel_y = yy
add_overlay(img)
add_overlay("evidence")
desc = "An organ storage container holding [I]."
I.loc = src
w_class = I.w_class
/obj/item/weapon/organ_storage/attack_self(mob/user)
if(contents.len)
var/obj/item/I = contents[1]
user.visible_message("[user] dumps [I] from [src].", "<span class='notice'>You dump [I] from [src].</span>")
cut_overlays()
I.forceMove(get_turf(src))
icon_state = "evidenceobj"
desc = "A container for holding body parts."
else
to_chat(user, "[src] is empty.")
return