diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index cf89b354..5b7becb5 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -1746,7 +1746,6 @@ "back_key" = TOOL_CROWBAR, "desc" = "Peripherals control module is installed." ), - //9 list( "key" = /obj/item/stock_parts/scanning_module, @@ -1784,40 +1783,37 @@ "back_key" = TOOL_SCREWDRIVER, "desc" = "Capacitor is secured." ), - //14 + + //11 list( "key" = TOOL_SCREWDRIVER, "back_key" = TOOL_CROWBAR, "desc" = "The power cell is installed." - //15 ), + + //12 list( "key" = /obj/item/stack/sheet/metal, "amount" = 5, "back_key" = TOOL_SCREWDRIVER, "desc" = "The power cell is secured." ), - //16 - list( - "key" = TOOL_SCREWDRIVER, - "back_key" = TOOL_CROWBAR, - "desc" = "The power cell is installed." - ), - //17 + + //13 list( "key" = TOOL_WRENCH, "back_key" = TOOL_CROWBAR, "desc" = "Internal armor is installed." ), - //18 + //14 list( "key" = TOOL_WELDER, "back_key" = TOOL_WRENCH, "desc" = "Internal armor is wrenched." ), - //19 + //15 list( "key" = /obj/item/stack/sheet/plasteel, "amount" = 5, @@ -1825,21 +1821,20 @@ "desc" = "Internal armor is welded." ), - //20 + //16 list( "key" = TOOL_WRENCH, "back_key" = TOOL_CROWBAR, "desc" = "External armor is installed." ), - //21 + //17 list( "key" = TOOL_WELDER, "back_key" = TOOL_WRENCH, "desc" = "External armor is wrenched." ), ) - /datum/component/construction/mecha/odysseus/custom_action(obj/item/I, mob/living/user, diff) if(!..()) return FALSE diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 7807c026..0debc38f 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -926,6 +926,16 @@ item_state = "marie" attack_verb = list("awoo'd", "shoved", "bonked") +/obj/item/toy/plush/mammal/marisol + desc = "An adorable stuffed toy resembling a demi-wolf security officer. That a baton, or is she happy to see you..?" + icon_state = "marisol" + item_state = "marisol" + +/obj/item/toy/plush/mammal/marilyn + desc = "A cute stuffed fox toy. Now, about that sponge bath..." + icon_state = "marilyn" + item_state = "marilyn" + /obj/item/toy/plush/catgirl name = "feline plushie" desc = "An adorable stuffed toy that resembles a feline." @@ -940,7 +950,7 @@ item_state = "mikeel" /obj/item/toy/plush/catgirl/skylar - desc = "An adorable stuffed toy that resembles a degenerate." + desc = "An adorable stuffed toy that resembles a pure and good cat boy." icon_state = "skylar" item_state = "skylar" attack_verb = list("powergamed", "merged", "tabled") diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e1f82e4a..d71174e6 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -285,6 +285,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ //Durathread fuck slash-asterisk comments GLOBAL_LIST_INIT(durathread_recipes, list ( \ new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/durathread, 4, time = 40), + new/datum/stack_recipe("durathread jumpskirt", /obj/item/clothing/under/durathread/skirt, 4, time = 40), \ + new/datum/stack_recipe("durathread bandolier", /obj/item/storage/belt/bandolier/durathread, 14, time = 60), \ new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \ new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \ new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \ diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index b2a6ae32..ad8e8303 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -709,9 +709,15 @@ icon_state = "durathread" item_state = "durathread" item_color = "durathread" - can_adjust = FALSE armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5) - +/obj/item/clothing/under/durathread/skirt + name = "durathread jumpskirt" + desc = "A jumpskirt made from durathread, its resilient fibres provide some protection to the wearer." + icon_state = "duraskirt" + item_state = "duraskirt" + item_color = "duraskirt" + can_adjust = FALSE + /obj/item/clothing/under/gear_harness name = "gear harness" desc = "A simple, inconspicuous harness replacement for a jumpsuit." diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 82d66aa6..49754d41 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -912,14 +912,6 @@ time = 30 category = CAT_CLOTHING -/datum/crafting_recipe/durathread_bandolier - name = "Durathread Bandolier" - result = /obj/item/storage/belt/bandolier/durathread - reqs = list(/obj/item/stack/sheet/durathread = 6, - /obj/item/stack/sheet/leather = 2) - time = 50 - category = CAT_CLOTHING - /datum/crafting_recipe/durathread_helmet name = "Makeshift Durathread Helmet" result = /obj/item/clothing/head/helmet/durathread diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 9336a77c..e36b946c 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -49,7 +49,7 @@ else padloc = "(UNKNOWN)" src.log_talk(message, LOG_SAY, tag="HOLOPAD in [padloc]") - send_speech(message, 7, T, "robot", language = language) + send_speech(message, 7, T, "robot", message_language = language) to_chat(src, "Holopad transmitted, [real_name] \"[message]\"") else to_chat(src, "No holopad connected.") diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 9db21f13..6a1cea8e 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -208,6 +208,7 @@ throwforce = 10 created_name = "Floorbot" var/toolbox = /obj/item/storage/toolbox/mechanical + var/toolbox_color = "" //Blank for blue, r for red, y for yellow, etc. /obj/item/bot_assembly/floorbot/Initialize() . = ..() @@ -219,25 +220,45 @@ if(ASSEMBLY_FIRST_STEP) desc = initial(desc) name = initial(name) - icon_state = initial(icon_state) + icon_state = "[toolbox_color]toolbox_tiles" if(ASSEMBLY_SECOND_STEP) desc = "It's a toolbox with tiles sticking out the top and a sensor attached." name = "incomplete floorbot assembly" - icon_state = "toolbox_tiles_sensor" + icon_state = "[toolbox_color]toolbox_tiles_sensor" + +/obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) + var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency, //which toolboxes can be made into floorbots + /obj/item/storage/toolbox/electrical, + /obj/item/storage/toolbox/mechanical, + /obj/item/storage/toolbox/artistic, + /obj/item/storage/toolbox/syndicate) -/obj/item/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) if(!istype(T, /obj/item/stack/tile/plasteel)) ..() return + if(!is_type_in_list(src, allowed_toolbox) && (type != /obj/item/storage/toolbox)) + return if(contents.len >= 1) to_chat(user, "They won't fit in, as there is already stuff inside!") return if(T.use(10)) var/obj/item/bot_assembly/floorbot/B = new B.toolbox = type + switch(B.toolbox) + if(/obj/item/storage/toolbox) + B.toolbox_color = "r" + if(/obj/item/storage/toolbox/emergency) + B.toolbox_color = "r" + if(/obj/item/storage/toolbox/electrical) + B.toolbox_color = "y" + if(/obj/item/storage/toolbox/artistic) + B.toolbox_color = "g" + if(/obj/item/storage/toolbox/syndicate) + B.toolbox_color = "s" user.put_in_hands(B) - to_chat(user, "You add the tiles into the empty [src.name]. They protrude from the top.") + B.update_icon() + to_chat(user, "You add the tiles into the empty [name]. They protrude from the top.") qdel(src) else to_chat(user, "You need 10 floor tiles to start building a floorbot!") @@ -259,7 +280,7 @@ if(istype(W, /obj/item/bodypart/l_arm/robot) || istype(W, /obj/item/bodypart/r_arm/robot)) if(!can_finish_build(W, user)) return - var/mob/living/simple_animal/bot/floorbot/A = new(drop_location()) + var/mob/living/simple_animal/bot/floorbot/A = new(drop_location(), toolbox_color) A.name = created_name A.robot_arm = W.type A.toolbox = toolbox diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 4709680a..c1a21b66 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -32,6 +32,7 @@ var/turf/target var/oldloc = null var/toolbox = /obj/item/storage/toolbox/mechanical + var/toolbox_color = "" #define HULL_BREACH 1 #define LINE_SPACE_MODE 2 @@ -41,12 +42,16 @@ #define REPLACE_TILE 6 #define TILE_EMAG 7 -/mob/living/simple_animal/bot/floorbot/Initialize() +/mob/living/simple_animal/bot/floorbot/Initialize(mapload, new_toolbox_color) . = ..() + toolbox_color = new_toolbox_color update_icon() var/datum/job/engineer/J = new/datum/job/engineer access_card.access += J.get_access() prev_access = access_card.access + if(toolbox_color == "s") + health = 100 + maxHealth = 100 /mob/living/simple_animal/bot/floorbot/turn_on() . = ..() @@ -312,7 +317,7 @@ return if(isspaceturf(target_turf)) //If we are fixing an area not part of pure space, it is anchored = TRUE - icon_state = "floorbot-c" + icon_state = "[toolbox_color]floorbot-c" visible_message("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ") mode = BOT_REPAIRING sleep(50) @@ -327,7 +332,7 @@ if(F.type != initial(tiletype.turf_type) && (F.broken || F.burnt || isplatingturf(F)) || F.type == (initial(tiletype.turf_type) && (F.broken || F.burnt))) anchored = TRUE - icon_state = "floorbot-c" + icon_state = "[toolbox_color]floorbot-c" mode = BOT_REPAIRING visible_message("[src] begins repairing the floor.") sleep(50) @@ -338,7 +343,7 @@ if(replacetiles && F.type != initial(tiletype.turf_type) && specialtiles && !isplatingturf(F)) anchored = TRUE - icon_state = "floorbot-c" + icon_state = "[toolbox_color]floorbot-c" mode = BOT_REPAIRING visible_message("[src] begins replacing the floor tiles.") sleep(50) @@ -355,7 +360,7 @@ target = null /mob/living/simple_animal/bot/floorbot/update_icon() - icon_state = "floorbot[on]" + icon_state = "[toolbox_color]floorbot[on]" /mob/living/simple_animal/bot/floorbot/explode() diff --git a/icons/mob/aibots.dmi b/icons/mob/aibots.dmi index 3dd431a2..bc3e3a85 100644 Binary files a/icons/mob/aibots.dmi and b/icons/mob/aibots.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index d2215610..572616f8 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index f4204380..354c274a 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index a8e6b20e..ce3e0ada 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm index 320a83b8..36053945 100644 --- a/modular_citadel/code/modules/client/loadout/neck.dm +++ b/modular_citadel/code/modules/client/loadout/neck.dm @@ -92,3 +92,8 @@ name = "Headphones" category = SLOT_NECK path = /obj/item/clothing/ears/headphones + +/datum/gear/polycloak + name = "Polychromic Cloak" + category = SLOT_NECK + path = /obj/item/clothing/neck/cloak/polychromic diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm index a0dbe3a0..6963b582 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -210,7 +210,6 @@ cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' has_snowflake_deadsprite = TRUE cyborg_pixel_offset = -16 - /obj/item/robot_module/miner/do_transform_animation() var/mob/living/silicon/robot/R = loc R.cut_overlays() @@ -222,7 +221,7 @@ /obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Heavy", "Sleek", "Marina", "Droid", "Eyebot") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Heavy", "Sleek", "Marina", "Droid", "Eyebot", "BootyF", "BootyM") if(!borg_icon) return FALSE switch(borg_icon) @@ -244,11 +243,19 @@ if("Heavy") cyborg_base_icon = "heavymed" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BootyF") + cyborg_base_icon = "bootymedical" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootymedicalM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/janitor/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/list/janimodels = list("Default", "Sleek", "Marina", "Can", "Heavy") + var/list/janimodels = list("Default", "Sleek", "Marina", "Can", "Heavy", "BootyF", "BootyM") var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in janimodels if(!borg_icon) return FALSE @@ -267,11 +274,19 @@ if("Heavy") cyborg_base_icon = "heavyres" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BootyF") + cyborg_base_icon = "bootyjanitor" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootyjanitorM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/peacekeeper/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Spider") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Spider", "BootyF", "BootyM") if(!borg_icon) return FALSE switch(borg_icon) @@ -280,11 +295,19 @@ if("Spider") cyborg_base_icon = "whitespider" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BootyF") + cyborg_base_icon = "bootypeace" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootypeaceM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/security/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Heavy", "Sleek", "Can", "Marina", "Spider") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Heavy", "Sleek", "Can", "Marina", "Spider", "BootyF", "BootyM") if(!borg_icon) return FALSE switch(borg_icon) @@ -309,11 +332,19 @@ if("Heavy") cyborg_base_icon = "heavysec" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BootyF") + cyborg_base_icon = "bootysecurity" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootysecurityM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/butler/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Waitress", "Heavy", "Sleek", "Butler", "Tophat", "Kent", "Bro") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Waitress", "Heavy", "Sleek", "Butler", "Tophat", "Kent", "Bro", "BootyF", "BootyM") if(!borg_icon) return FALSE switch(borg_icon) @@ -339,11 +370,19 @@ cyborg_base_icon = "heavyserv" special_light_key = "heavyserv" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BootyF") + cyborg_base_icon = "bootyservice" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootyserviceM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer") + var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer", "BootyF", "BootyM") if(R.client && R.client.ckey in list("nezuli")) engymodels += "Alina" var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in engymodels @@ -395,11 +434,19 @@ has_snowflake_deadsprite = TRUE dogborg = TRUE cyborg_pixel_offset = -16 + if("BootyF") + cyborg_base_icon = "bootyengineer" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootyengineerM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid", "BootyF", "BootyM") if(!borg_icon) return FALSE switch(borg_icon) @@ -427,4 +474,48 @@ if("Heavy") cyborg_base_icon = "heavymin" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BootyF") + cyborg_base_icon = "bootyminer" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootyminerM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + return ..() + +/obj/item/robot_module/standard/be_transformed_to(obj/item/robot_module/old_module) + var/mob/living/silicon/robot/R = loc + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Standard", "BootyF", "BootyM" ) + if(!borg_icon) + return FALSE + switch(borg_icon) + if("Standard") + cyborg_base_icon = "standard" + if("BootyF") + cyborg_base_icon = "bootystandard" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootystandardM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + return ..() + +/obj/item/robot_module/clown/be_transformed_to(obj/item/robot_module/old_module) + var/mob/living/silicon/robot/R = loc + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Standard", "BootyF", "BootyM" ) + if(!borg_icon) + return FALSE + switch(borg_icon) + if("Standard") + cyborg_base_icon = "clown" + if("BootyF") + cyborg_base_icon = "bootyclown" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BootyM") + cyborg_base_icon = "bootyclownM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 9e009390..2a32276b 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -411,14 +411,14 @@ /datum/chemical_reaction/fermi/acidic_buffer//done test name = "Acetic acid buffer" id = "acidic_buffer" - results = list("acidic_buffer" = 2) //acetic acid - required_reagents = list("salglu_solution" = 0.2, "ethanol" = 0.6, "oxygen" = 0.6, "water" = 0.6) + results = list("acidic_buffer" = 10) //acetic acid + required_reagents = list("salglu_solution" = 1, "ethanol" = 3, "oxygen" = 3, "water" = 3) //FermiChem vars: OptimalTempMin = 250 OptimalTempMax = 500 ExplodeTemp = 9999 //check to see overflow doesn't happen! - OptimalpHMin = 2 - OptimalpHMax = 6 + OptimalpHMin = 0 + OptimalpHMax = 14 ReactpHLim = 0 //CatalystFact = 0 //To do 1 CurveSharpT = 4 @@ -438,15 +438,15 @@ /datum/chemical_reaction/fermi/basic_buffer//done test name = "Ethyl Ethanoate buffer" id = "basic_buffer" - results = list("basic_buffer" = 1.5) - required_reagents = list("acidic_buffer" = 0.5, "ethanol" = 0.5, "water" = 0.5) + results = list("basic_buffer" = 5) + required_reagents = list("lye" = 1, "ethanol" = 2, "water" = 2) required_catalysts = list("sacid" = 1) //vagely acetic - //FermiChem vars:x + //FermiChem vars: OptimalTempMin = 250 OptimalTempMax = 500 ExplodeTemp = 9999 //check to see overflow doesn't happen! - OptimalpHMin = 5 - OptimalpHMax = 12 + OptimalpHMin = 0 + OptimalpHMax = 14 ReactpHLim = 0 //CatalystFact = 0 //To do 1 CurveSharpT = 4 diff --git a/modular_citadel/icons/mob/robots.dmi b/modular_citadel/icons/mob/robots.dmi index b47ee128..af309d45 100644 Binary files a/modular_citadel/icons/mob/robots.dmi and b/modular_citadel/icons/mob/robots.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 20405124..4efff08d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1517,6 +1517,7 @@ #include "code\modules\clothing\neck\_neck.dm" #include "code\modules\clothing\outfits\ert.dm" #include "code\modules\clothing\outfits\event.dm" +#include "code\modules\clothing\outfits\plasmaman.dm" #include "code\modules\clothing\outfits\standard.dm" #include "code\modules\clothing\outfits\vr.dm" #include "code\modules\clothing\outfits\vv_outfit.dm" @@ -1559,6 +1560,10 @@ #include "code\modules\clothing\under\jobs\engineering.dm" #include "code\modules\clothing\under\jobs\medsci.dm" #include "code\modules\clothing\under\jobs\security.dm" +#include "code\modules\clothing\under\jobs\Plasmaman\civilian_service.dm" +#include "code\modules\clothing\under\jobs\Plasmaman\engineering.dm" +#include "code\modules\clothing\under\jobs\Plasmaman\medsci.dm" +#include "code\modules\clothing\under\jobs\Plasmaman\security.dm" #include "code\modules\crafting\craft.dm" #include "code\modules\crafting\guncrafting.dm" #include "code\modules\crafting\recipes.dm"