cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

save progress (#26976)

Browse Source
This commit is contained in:
Qwertytoforty
2024-10-14 20:55:41 -04:00
committed by GitHub
parent f5ee256c71
commit 0973879763
8 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_arms.dm
+9 -1
View File
@@ -3,7 +3,7 @@
desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
parent_organ = "r_arm"
slot = "r_arm_device"
icon_state = "implant-toolkit"
icon_state = "toolkit_generic"
w_class = WEIGHT_CLASS_NORMAL
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -223,6 +223,7 @@
/obj/item/organ/internal/cyberimp/arm/toolset
name = "integrated toolset implant"
desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all neccessary tools."
icon_state = "toolkit_engineering"
origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4"
contents = newlist(/obj/item/screwdriver/cyborg, /obj/item/wrench/cyborg, /obj/item/weldingtool/largetank/cyborg,
/obj/item/crowbar/cyborg, /obj/item/wirecutters/cyborg, /obj/item/multitool/cyborg)
@@ -242,6 +243,7 @@
/obj/item/organ/internal/cyberimp/arm/toolset_abductor
name = "alien toolset implant"
desc = "An alien toolset, designed to be installed on subject's arm."
icon_state = "toolkit_engineering"
origin_tech = "materials=5;engineering=5;plasmatech=5;powerstorage=4;abductor=3"
contents = newlist(/obj/item/screwdriver/abductor, /obj/item/wirecutters/abductor, /obj/item/crowbar/abductor, /obj/item/wrench/abductor, /obj/item/weldingtool/abductor, /obj/item/multitool/abductor)
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/abductor.dmi')
@@ -253,6 +255,7 @@
/obj/item/organ/internal/cyberimp/arm/janitorial_abductor
name = "alien janitorial toolset implant"
desc = "A set of alien janitorial tools, designed to be installed on subject's arm."
icon_state = "toolkit_janitor"
origin_tech = "materials=5;engineering=5;biotech=5;powerstorage=4;abductor=2"
contents = newlist(/obj/item/mop/advanced/abductor, /obj/item/soap/syndie/abductor, /obj/item/lightreplacer/bluespace/abductor, /obj/item/holosign_creator/janitor, /obj/item/melee/flyswatter/abductor, /obj/item/reagent_containers/spray/cleaner/safety/abductor)
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/abductor.dmi')
@@ -264,6 +267,7 @@
/obj/item/organ/internal/cyberimp/arm/surgical_abductor
name = "alien surgical toolset implant"
desc = "An alien surgical toolset, designed to be installed on the subject's arm."
icon_state = "toolkit_surgical"
origin_tech = "materials=5;engineering=5;plasmatech=5;powerstorage=4;abductor=2"
contents = newlist(/obj/item/retractor/alien, /obj/item/hemostat/alien, /obj/item/cautery/alien, /obj/item/bonesetter/alien, /obj/item/scalpel/alien, /obj/item/circular_saw/alien, /obj/item/bonegel/alien, /obj/item/FixOVein/alien, /obj/item/surgicaldrill/alien)
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/abductor.dmi')
@@ -330,6 +334,7 @@
/obj/item/organ/internal/cyberimp/arm/surgery
name = "surgical toolset implant"
desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
icon_state = "toolkit_surgical"
contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/bonesetter/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/bonegel/augment, /obj/item/FixOVein/augment, /obj/item/surgicaldrill/augment)
origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/storage.dmi')
@@ -342,6 +347,7 @@
/obj/item/organ/internal/cyberimp/arm/janitorial
name = "janitorial toolset implant"
desc = "A set of janitorial tools hidden behind a concealed panel on the user's arm"
icon_state = "toolkit_janitor"
contents = newlist(/obj/item/mop/advanced, /obj/item/soap, /obj/item/lightreplacer, /obj/item/holosign_creator/janitor, /obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/cleaner/safety)
origin_tech = "materials=3;engineering=4;biotech=3"
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/clothing/belts.dmi')
@@ -369,6 +375,7 @@
/obj/item/organ/internal/cyberimp/arm/botanical
name = "botanical toolset implant"
desc = "A set of botanical tools hidden behind a concealed panel on the user's arm"
icon_state = "toolkit_hydro"
contents = newlist(/obj/item/plant_analyzer, /obj/item/cultivator, /obj/item/hatchet, /obj/item/shovel/spade, /obj/item/reagent_containers/spray/weedspray, /obj/item/reagent_containers/spray/pestspray)
origin_tech = "materials=3;engineering=4;biotech=3"
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/clothing/belts.dmi')
@@ -382,6 +389,7 @@
/obj/item/organ/internal/cyberimp/arm/power_cord
name = "APC-compatible power adapter implant"
desc = "An implant commonly installed inside IPCs in order to allow them to easily collect energy from their environment"
icon_state = "toolkit_ipc"
origin_tech = "materials=3;biotech=2;powerstorage=3"
contents = newlist(/obj/item/apc_powercord)
requires_robotic_bodypart = TRUE
code/modules/surgery/organs/augments_eyes.dm
+5 -6
View File
@@ -2,7 +2,6 @@
name = "cybernetic eyes"
desc = "artificial photoreceptors with specialized functionality."
icon_state = "eye_implant"
implant_overlay = "eye_implant_overlay"
slot = "eye_sight"
parent_organ = "eyes"
w_class = WEIGHT_CLASS_TINY
@@ -39,7 +38,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/medical
name = "Medical HUD implant"
desc = "These cybernetic eye implants will display a medical HUD over everything you see."
implant_color = "#00FFFF"
icon_state = "eye_implant_medical"
origin_tech = "materials=4;programming=4;biotech=4"
aug_message = "You suddenly see health bars floating above people's heads..."
HUD_type = DATA_HUD_MEDICAL_ADVANCED
@@ -48,7 +47,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/diagnostic
name = "Diagnostic HUD implant"
desc = "These cybernetic eye implants will display a diagnostic HUD over everything you see."
implant_color = "#ff9000"
icon_state = "eye_implant_diagnostic"
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_ADVANCED
@@ -56,7 +55,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/security
name = "Security HUD implant"
desc = "These cybernetic eye implants will display a security HUD over everything you see."
implant_color = "#CC0000"
icon_state = "eye_implant_security"
origin_tech = "materials=4;programming=4;biotech=3;combat=3"
aug_message = "Job indicator icons pop up in your vision. That is not a certified surgeon..."
HUD_type = DATA_HUD_SECURITY_ADVANCED
@@ -65,7 +64,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/jani
name = "Janitor HUD implant"
desc = "These cybernetic eye implants will display a filth HUD over everything you see."
implant_color = "#DFBE00"
icon_state = "eye_implant_janitor"
origin_tech = "materials=4;engineering=4;biotech=4"
aug_message = "You scan for filth spots around you..."
HUD_type = DATA_HUD_JANITOR
@@ -73,7 +72,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/hydroponic
name = "Hydroponic HUD implant"
desc = "These cybernetic eye implants will display a botanical HUD over everything you see."
implant_color = "#4850D5"
icon_state = "eye_implant_hydro"
origin_tech = "materials=4;magnets=4;biotech=4"
aug_message = "You scan for non-plastic plants around you..."
HUD_type = DATA_HUD_HYDROPONIC
code/modules/surgery/organs/augments_internal.dm
+8 -5
View File
@@ -42,12 +42,13 @@
/obj/item/organ/internal/cyberimp/brain/anti_drop
name = "Anti-drop implant"
desc = "This cybernetic brain implant will allow you to force your hand muscles to contract, preventing item dropping. Twitch ear to toggle."
icon_state = "brain_implant_antidrop"
var/active = FALSE
var/l_hand_ignore = FALSE
var/r_hand_ignore = FALSE
var/obj/item/l_hand_obj = null
var/obj/item/r_hand_obj = null
implant_color = "#DE7E00"
implant_overlay = null
slot = "brain_antidrop"
origin_tech = "materials=4;programming=5;biotech=4"
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -133,7 +134,7 @@
/obj/item/organ/internal/cyberimp/brain/anti_stam
name = "CNS Rebooter implant"
desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when fatigued. Incompatible with the Neural Jumpstarter."
implant_color = "#FFFF00"
icon_state = "brain_implant_rebooter"
slot = "brain_antistun"
origin_tech = "materials=5;programming=4;biotech=5"
/// How much we multiply the owners stamina regen block modifier by.
@@ -594,7 +595,8 @@
/obj/item/organ/internal/cyberimp/chest/nutriment
name = "Nutriment pump implant"
desc = "This implant will synthesize a small amount of nutriment and pumps it directly into your bloodstream when you are starving."
implant_color = "#00AA00"
icon_state = "nutriment_implant"
implant_overlay = null
var/hunger_threshold = NUTRITION_LEVEL_STARVING
var/synthesizing = 0
var/poison_amount = 5
@@ -643,7 +645,7 @@
/obj/item/organ/internal/cyberimp/chest/nutriment/plus
name = "Nutriment pump implant PLUS"
desc = "This implant will synthesize a small amount of nutriment and pumps it directly into your bloodstream when you are hungry."
implant_color = "#006607"
icon_state = "adv_nutriment_implant"
hunger_threshold = NUTRITION_LEVEL_HUNGRY
poison_amount = 10
origin_tech = "materials=4;powerstorage=3;biotech=3"
@@ -659,7 +661,8 @@
/obj/item/organ/internal/cyberimp/chest/reviver
name = "Reviver implant"
desc = "This implant will attempt to heal you out of critical condition. For the faint of heart!"
implant_color = "#AD0000"
icon_state = "reviver_implant"
implant_overlay = null
origin_tech = "materials=5;programming=4;biotech=4"
slot = "heartdrive"
var/revive_cost = 0
code/modules/surgery/organs/eyes.dm
+6 -1
View File
@@ -126,6 +126,7 @@
/obj/item/organ/internal/eyes/cybernetic/meson
name = "meson eyes"
desc = "These cybernetic eyes will allow you to see the structural layout of the station, and, well, everything else."
icon_state = "eyes-c-meson"
eye_color = "#199900"
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
origin_tech = "materials=4;engineering=4;biotech=4;magnets=4"
@@ -141,6 +142,7 @@
/obj/item/organ/internal/eyes/cybernetic/xray
name = "\improper X-ray eyes"
desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile."
icon_state = "eyes-c-xray"
see_in_dark = 8
vision_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
origin_tech = "materials=4;programming=4;biotech=7;magnets=4"
@@ -148,13 +150,15 @@
/obj/item/organ/internal/eyes/cybernetic/xray/hardened
name = "hardened X-ray eyes"
desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile. This pair has been hardened for special operations personnel."
eye_color = "#FFCC00"
emp_proof = TRUE
origin_tech = "materials=6;programming=5;biotech=7;magnets=6;syndicate=3"
/obj/item/organ/internal/eyes/cybernetic/thermals
name = "thermal eyes"
desc = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included."
eye_color = "#FFCC00"
icon_state = "eyes-c-thermal"
eye_color = "#E12224"
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
flash_protect = FLASH_PROTECTION_SENSITIVE
@@ -170,6 +174,7 @@
/obj/item/organ/internal/eyes/cybernetic/scope
name = "\improper Kaleido Optics eyes"
desc = "These cybernetic eye implants will let you zoom in on far away objects. Many users find it disorienting, and find it hard to interact with things near them when active."
icon_state = "eyes-c-kaleido"
eye_color = "#6f00ff"
flash_protect = FLASH_PROTECTION_EXTRA_SENSITIVE
origin_tech = "materials=5;programming=4;biotech=4;magnets=4"
code/modules/surgery/organs/subtypes/machine_organs.dm
+3 -5
View File
@@ -104,10 +104,10 @@
/obj/item/organ/internal/cell
name = "microbattery"
desc = "A small, powerful cell for use in fully prosthetic bodies."
icon = 'icons/obj/power.dmi'
icon_state = "scell"
icon_state = "cell"
organ_tag = "heart"
parent_organ = "chest"
dead_icon = "cell_bork"
slot = "heart"
vital = TRUE
status = ORGAN_ROBOT
@@ -118,7 +118,6 @@
icon = 'icons/obj/robot_component.dmi'
icon_state = "camera"
status = ORGAN_ROBOT
// dead_icon = "camera_broken"
weld_proof = TRUE
requires_robotic_bodypart = TRUE
@@ -150,8 +149,7 @@
/obj/item/organ/internal/ears/microphone
name = "microphone"
icon = 'icons/obj/device.dmi'
icon_state = "taperecorder_idle"
icon_state = "voicebox"
status = ORGAN_ROBOT
dead_icon = "taperecorder_empty"
requires_robotic_bodypart = TRUE