From 92d442b9f066aab03adcb34655dbefa7955906f6 Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Sat, 19 Nov 2016 16:54:51 +0000 Subject: [PATCH] Fixes some issues and reverts some changes to cyborgs (#14) Removed cyborg RCD upgrade Fixed tox mod Fixed four sound pref defines --- code/__defines/misc.dm | 7 ++++ .../carbon/human/species/station/station.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 33 ++++++++----------- code/modules/research/mechfab_designs.dm | 4 ++- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 431534d940b..e5f1e52c16d 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -50,6 +50,13 @@ #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC) +//Sound effects toggles +#define ASFX_AMBIENCE 1 +#define ASFX_FOOTSTEPS 2 +#define ASFX_VOTE 4 + +#define ASFX_DEFAULT (ASFX_AMBIENCE|ASFX_FOOTSTEPS|ASFX_VOTE) + // For secHUDs and medHUDs and variants. The number is the location of the image on the list hud_list of humans. #define HEALTH_HUD 1 // A simple line rounding the mob's number health. #define STATUS_HUD 2 // Alive, dead, diseased, etc. diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 4e0d1d4884e..f4007d7f395 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -443,7 +443,7 @@ eyes = "vaurca_eyes" //makes it so that eye colour is not changed when skin colour is. brute_mod = 0.5 //note to self: remove is_synthetic checks for brmod and burnmod burn_mod = 1.5 //2x was a bit too much. we'll see how this goes. - tox_mod = 3 //they're not used to all our weird human bacteria. + toxins_mod = 3 //they're not used to all our weird human bacteria. warning_low_pressure = 50 hazard_low_pressure = 0 ethanol_resistance = 2 diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 553ae37ac4f..dbc824be5b5 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -182,17 +182,18 @@ var/global/list/robot_modules = list( networks = list(NETWORK_MEDICAL) subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) can_be_pushed = 0 + sprites = list( + "Basic" = "Medbot", + "Standard" = "surgeon", + "Advanced Droid" = "droid-medical", + "Needles" = "medicalrobot", + "Drone - Medical" = "drone-medical", + "Drone - Chemistry" = "drone-chemistry", + "Eyebot" = "eyebot-medical" + ) /obj/item/weapon/robot_module/medical/general name = "medical robot module" - sprites = list( - "Basic" = "Medbot", - "Standard" = "surgeon", - "Advanced Droid" = "droid-medical", - "Needles" = "medicalrobot", - "Drone" = "drone-surgery", - "Eyebot" = "eyebot-medical" - ) /obj/item/weapon/robot_module/medical/general/New() ..() @@ -240,15 +241,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/medical/rescue name = "rescue robot module" - sprites = list( - "Basic" = "Medbot", - "Standard" = "surgeon", - "Advanced Droid" = "droid-medical", - "Needles" = "medicalrobot", - "Drone - Medical" = "drone-medical", - "Drone - Chemistry" = "drone-chemistry", - "Eyebot" = "eyebot-medical" - ) + supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack) /obj/item/weapon/robot_module/medical/rescue/New() @@ -309,7 +302,7 @@ var/global/list/robot_modules = list( channels = list("Engineering" = 1) networks = list(NETWORK_ENGINEERING) subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor) - supported_upgrades = list(/obj/item/borg/upgrade/rcd) + supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack) sprites = list( "Basic" = "Engineering", "Antique" = "engineerrobot", @@ -430,7 +423,7 @@ var/global/list/robot_modules = list( networks = list(NETWORK_SECURITY) subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) can_be_pushed = 0 - supported_upgrades = list(/obj/item/borg/upgrade/tasercooler) + supported_upgrades = list(/obj/item/borg/upgrade/tasercooler,/obj/item/robot_parts/robot_component/jetpack) /obj/item/weapon/robot_module/security/general sprites = list( @@ -467,7 +460,7 @@ var/global/list/robot_modules = list( B.bcell.give(amount) /obj/item/weapon/robot_module/janitor - name = "janitorial robot module" + name = "custodial robot module" channels = list("Service" = 1) sprites = list( "Basic" = "JanBot2", diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index ed1e30eadd9..1a3ef67b9b1 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -368,13 +368,15 @@ materials = list(DEFAULT_WALL_MATERIAL = 10000, "phoron" = 15000, "uranium" = 20000) build_path = /obj/item/robot_parts/robot_component/jetpack +/* +//Commented out by nanako /datum/design/item/robot_upgrade/rcd name = "RCD module" desc = "A rapid construction device module for use during construction operations." id = "borg_rcd_module" materials = list(DEFAULT_WALL_MATERIAL = 25000, "phoron" = 15000, "uranium" = 20000) build_path = /obj/item/borg/upgrade/rcd - +*/ /datum/design/item/robot_upgrade/syndicate name = "Illegal upgrade" desc = "Allows for the construction of lethal upgrades for cyborgs."