cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into hair-gradients

Browse Source
This commit is contained in:
mochi
2021-10-27 13:33:12 +02:00
parent 2dd4c07c34 2d3e44511e
commit c7046c0756
1117 changed files with 53392 additions and 61705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_eyes.dm
+1 -1
View File
@@ -51,7 +51,7 @@
implant_color = "#ff9000"
origin_tech = "materials=4;engineering=4;biotech=4"
aug_message = "You see the diagnostic information of the synthetics around you..."
HUD_type = DATA_HUD_DIAGNOSTIC
HUD_type = DATA_HUD_DIAGNOSTIC_ADVANCED
/obj/item/organ/internal/cyberimp/eyes/hud/security
name = "Security HUD implant"
code/modules/surgery/organs/augments_internal.dm
+1 -1
View File
@@ -161,7 +161,7 @@
emp_proof = TRUE
/obj/item/organ/internal/cyberimp/brain/anti_sleep
name = "Nerual Jumpstarter implant"
name = "Neural Jumpstarter implant"
desc = "This implant will automatically attempt to jolt you awake when it detects you have fallen unconscious. Has a short cooldown, incompatible with the CNS Rebooter."
implant_color = "#0356fc"
slot = "brain_antistun" //one or the other not both.
code/modules/surgery/organs/lungs.dm
+1 -1
View File
@@ -76,7 +76,7 @@
owner.emote("cough") //respitory tract infection
if(is_bruised())
if(prob(2))
if(prob(2) && !(NO_BLOOD in owner.dna.species.species_traits))
owner.custom_emote(1, "coughs up blood!")
owner.bleed(1)
if(prob(4))
code/modules/surgery/organs/subtypes/diona.dm
+4 -4
View File
@@ -18,28 +18,28 @@
max_damage = 35
min_broken_damage = 20
amputation_point = "upper left trunk"
convertable_children = list(/obj/item/organ/external/arm/diona)
convertable_children = list(/obj/item/organ/external/hand/diona)
/obj/item/organ/external/arm/right/diona
name = "right upper tendril"
max_damage = 35
min_broken_damage = 20
amputation_point = "upper right trunk"
convertable_children = list(/obj/item/organ/external/arm/right/diona)
convertable_children = list(/obj/item/organ/external/hand/right/diona)
/obj/item/organ/external/leg/diona
name = "left lower tendril"
max_damage = 35
min_broken_damage = 20
amputation_point = "lower left fork"
convertable_children = list(/obj/item/organ/external/leg/diona)
convertable_children = list(/obj/item/organ/external/foot/diona)
/obj/item/organ/external/leg/right/diona
name = "right lower tendril"
max_damage = 35
min_broken_damage = 20
amputation_point = "lower right fork"
convertable_children = list(/obj/item/organ/external/leg/right/diona)
convertable_children = list(/obj/item/organ/external/foot/right/diona)
/obj/item/organ/external/foot/diona
name = "left foot"
code/modules/surgery/organs/subtypes/skrell.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/obj/item/held_item
/obj/item/organ/internal/headpocket/Destroy()
QDEL_NULL(held_item)
empty_contents()
return ..()
/obj/item/organ/internal/headpocket/on_life()
code/modules/surgery/organs/subtypes/unbreakable.dm
+6 -1
View File
@@ -16,7 +16,7 @@
/obj/item/organ/external/leg/unbreakable
cannot_break = TRUE
convertable_children = list(/obj/item/organ/external/foot/right/unbreakable)
convertable_children = list(/obj/item/organ/external/foot/unbreakable)
/obj/item/organ/external/leg/right/unbreakable
cannot_break = TRUE
@@ -41,21 +41,26 @@
// Cannot dismember or break
/obj/item/organ/external/chest/unbreakable/sturdy
cannot_amputate = TRUE
convertable_children = list(/obj/item/organ/external/groin/unbreakable/sturdy)
/obj/item/organ/external/groin/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/arm/unbreakable/sturdy
cannot_amputate = TRUE
convertable_children = list(/obj/item/organ/external/hand/unbreakable/sturdy)
/obj/item/organ/external/arm/right/unbreakable/sturdy
cannot_amputate = TRUE
convertable_children = list(/obj/item/organ/external/hand/right/unbreakable/sturdy)
/obj/item/organ/external/leg/unbreakable/sturdy
cannot_amputate = TRUE
convertable_children = list(/obj/item/organ/external/foot/unbreakable/sturdy)
/obj/item/organ/external/leg/right/unbreakable/sturdy
cannot_amputate = TRUE
convertable_children = list(/obj/item/organ/external/foot/right/unbreakable/sturdy)
/obj/item/organ/external/foot/unbreakable/sturdy
cannot_amputate = TRUE