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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952

Browse Source
This commit is contained in:
LetterJay
2017-05-17 10:12:36 -05:00
parent bbdcff81bb 99e0c82a92
commit 5da8c5d520
454 changed files with 16010 additions and 8089 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bodyparts/dismemberment.dm
+5
View File
@@ -262,6 +262,8 @@
if(held_index > C.hand_bodyparts.len)
C.hand_bodyparts.len = held_index
C.hand_bodyparts[held_index] = src
if(C.dna.species.mutanthands && !is_pseudopart)
C.put_in_hand(new C.dna.species.mutanthands(), held_index)
if(C.hud_used)
var/obj/screen/inventory/hand/hand = C.hud_used.hand_slots["[held_index]"]
if(hand)
@@ -277,6 +279,9 @@
qdel(S)
break
for(var/obj/item/organ/O in contents)
O.Insert(C)
update_bodypart_damage_state()
C.updatehealth()
code/modules/surgery/organ_manipulation.dm
+1 -1
View File
@@ -106,7 +106,7 @@
"<span class='notice'>You begin to mend the incision in [target]'s [parse_zone(target_zone)]...</span>")
else if(istype(tool, /obj/item/weapon/reagent_containers/food/snacks/organ))
to_chat(user, "<span class='warning'>[tool] was biten by someone! It's too damaged to use!</span>")
to_chat(user, "<span class='warning'>[tool] was bitten by someone! It's too damaged to use!</span>")
return -1
/datum/surgery_step/manipulate_organs/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
code/modules/surgery/organs/eyes.dm
+3
View File
@@ -64,6 +64,9 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
sight_flags = SEE_MOBS
/obj/item/organ/eyes/night_vision/zombie
name = "undead eyes"
desc = "Somewhat counterintuitively, these half rotten eyes actually have superior vision to those of a living human."
///Robotic
code/modules/surgery/organs/organ_internal.dm
+5 -8
View File
@@ -125,16 +125,13 @@
if(!getorganslot("tongue"))
var/obj/item/organ/tongue/T
if(dna && dna.species)
for(var/tongue_type in dna.species.mutant_organs)
if(ispath(tongue_type, /obj/item/organ/tongue))
T = new tongue_type()
T.Insert(src)
if(dna && dna.species && dna.species.mutanttongue)
T = new dna.species.mutanttongue()
else
T = new()
// if they have no mutant tongues, give them a regular one
if(!T)
T = new()
T.Insert(src)
T.Insert(src)
if(!getorganslot("eye_sight"))
var/obj/item/organ/eyes/E
code/modules/surgery/organs/tongue.dm
+8 -14
View File
@@ -10,9 +10,10 @@
var/taste_sensitivity = 15 // lower is more sensitive.
/obj/item/organ/tongue/Initialize(mapload)
..()
. = ..()
languages_possible = typecacheof(list(
/datum/language/common,
/datum/language/draconic,
/datum/language/monkey,
/datum/language/ratvar
))
@@ -33,7 +34,7 @@
if(say_mod && M.dna && M.dna.species)
M.dna.species.say_mod = initial(M.dna.species.say_mod)
/obj/item/organ/tongue/can_speak_in_language(datum/language/dt)
/obj/item/organ/tongue/could_speak_in_language(datum/language/dt)
. = is_type_in_typecache(dt, languages_possible)
/obj/item/organ/tongue/lizard
@@ -123,10 +124,11 @@
taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED
/obj/item/organ/tongue/alien/Initialize(mapload)
..()
. = ..()
languages_possible = typecacheof(list(
/datum/language/xenocommon,
/datum/language/common,
/datum/language/draconic,
/datum/language/ratvar,
/datum/language/monkey))
@@ -175,7 +177,7 @@
/obj/item/organ/tongue/bone/plasmaman/get_spans()
return
/obj/item/organ/tongue/robot
name = "robotic voicebox"
desc = "A voice synthesizer that can interface with organic lifeforms."
@@ -185,16 +187,8 @@
attack_verb = list("beeped", "booped")
taste_sensitivity = 25 // not as good as an organic tongue
/obj/item/organ/tongue/robot/Initialize(mapload)
..()
languages_possible = typecacheof(list(
/datum/language/xenocommon,
/datum/language/common,
/datum/language/ratvar,
/datum/language/monkey,
/datum/language/drone,
/datum/language/machine,
/datum/language/swarmer))
/obj/item/organ/tongue/robot/can_speak_in_language(datum/language/dt)
. = TRUE // THE MAGIC OF ELECTRONICS
/obj/item/organ/tongue/robot/get_spans()
return ..() | SPAN_ROBOT
code/modules/surgery/organs/vocal_cords.dm
+35 -1
View File
@@ -20,6 +20,40 @@
/obj/item/organ/vocal_cords/proc/handle_speech(message) //actually say the message
owner.say(message, spans = spans, sanitize = FALSE)
/obj/item/organ/adamantine_resonator
name = "adamantine resonator"
desc = "Fragments of adamantine exists in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
zone = "head"
slot = "adamantine_resonator"
icon_state = "adamantine_resonator"
/obj/item/organ/vocal_cords/adamantine
name = "adamantine vocal cords"
desc = "When adamantine resonates, it causes all nearby pieces of adamantine to resonate as well. Adamantine golems use this to broadcast messages to nearby golems."
actions_types = list(/datum/action/item_action/organ_action/use/adamantine_vocal_cords)
zone = "mouth"
slot = "vocal_cords"
icon_state = "adamantine_cords"
/datum/action/item_action/organ_action/use/adamantine_vocal_cords/Trigger()
if(!IsAvailable())
return
var/message = input(owner, "Resonate a message to all nearby golems.", "Resonate")
if(QDELETED(src) || QDELETED(owner) || !message)
return
owner.say(".x[message]")
/obj/item/organ/vocal_cords/adamantine/handle_speech(message)
var/msg = "<span class='resonate'><span class='name'>[owner.real_name]</span> <span class='message'>resonates, \"[message]\"</span></span>"
for(var/m in GLOB.player_list)
if(iscarbon(m))
var/mob/living/carbon/C = m
if(C.getorganslot("adamantine_resonator"))
to_chat(C, msg)
if(isobserver(m))
var/link = FOLLOW_LINK(m, owner)
to_chat(m, "[link] [msg]")
//Colossus drop, forces the listeners to obey certain commands
/obj/item/organ/vocal_cords/colossus
name = "divine vocal cords"
@@ -248,7 +282,7 @@
else if((findtext(message, silence_words)))
cooldown = COOLDOWN_STUN
for(var/mob/living/carbon/C in listeners)
if(user.mind && (user.mind.assigned_role == "Librarian" || user.mind.assigned_role == "Mime"))
if(user.mind && (user.mind.assigned_role == "Curator" || user.mind.assigned_role == "Mime"))
power_multiplier *= 3
C.silent += (10 * power_multiplier)
code/modules/surgery/organs/vocal_cords.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm (rejected hunks)
@@ -51,7 +51,7 @@
if(C.getorganslot("adamantine_resonator"))
to_chat(C, msg)
if(isobserver(m))
- var/link = FOLLOW_LINK(m, src)
+ var/link = FOLLOW_LINK(m, owner)
to_chat(m, "[link] [msg]")
//Colossus drop, forces the listeners to obey certain commands
code/modules/surgery/prosthetic_replacement.dm
+2 -2
View File
@@ -72,9 +72,9 @@
user.visible_message("[user] successfully replaces [target]'s [parse_zone(target_zone)]!", "<span class='notice'>You succeed in replacing [target]'s [parse_zone(target_zone)].</span>")
return 1
else
target.regenerate_limb(target_zone)
var/obj/item/bodypart/L = target.get_bodypart(target_zone)
var/obj/item/bodypart/L = target.newBodyPart(target_zone, FALSE, FALSE)
L.is_pseudopart = TRUE
L.attach_limb(target)
user.visible_message("[user] finishes attaching [tool]!", "<span class='notice'>You attach [tool].</span>")
qdel(tool)
if(istype(tool, /obj/item/weapon/twohanded/required/chainsaw))
code/modules/surgery/tools.dm
+3 -12
View File
@@ -111,17 +111,8 @@
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
if(!isorgan(I) && !isbodypart(I))
to_chat(user, "<span class='notice'>[src] can only hold body parts!</span>")
return
user.visible_message("[user] puts [I] into [src].", "<span class='notice'>You put [I] inside [src].</span>")
@@ -150,4 +141,4 @@
desc = "A container for holding body parts."
else
to_chat(user, "[src] is empty.")
return
return