diff --git a/_maps/shuttles/zubbers/emergency_millionaire.dmm b/_maps/shuttles/zubbers/emergency_millionaire.dmm index 018ae1fee5c..5e730174f21 100644 --- a/_maps/shuttles/zubbers/emergency_millionaire.dmm +++ b/_maps/shuttles/zubbers/emergency_millionaire.dmm @@ -806,7 +806,7 @@ name = "Security Storage"; req_access = list("brig") }, -/mob/living/simple_animal/bot/secbot/beepsky/armsky{ +/mob/living/basic/bot/secbot/beepsky/armsky{ pixel_y = 3; desc = "Defender of the righteous, saviour of the weak."; name = "Brother Paladinsky"; diff --git a/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm index 4167ef30c54..95bd2c5d49f 100644 --- a/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm +++ b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm @@ -324,6 +324,10 @@ icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/highsec.dmi' overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/overlays.dmi' +//NUKIE AIRLOCK - Already looks great, this makes it call for no overlay emissives like on upstream... again. +/obj/machinery/door/airlock/highsecurity/syndicate + overlays_file = null + //TITANIUM / SHUTTLE /obj/machinery/door/airlock/titanium icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/shuttle.dmi' diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/recipes/medicine.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/recipes/medicine.dm index 1b6883c3567..5b503cfaa2d 100644 --- a/modular_skyrat/modules/customization/modules/reagents/chemistry/recipes/medicine.dm +++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/recipes/medicine.dm @@ -16,13 +16,13 @@ /datum/chemical_reaction/medicine/taste_suppressor results = list(/datum/reagent/medicine/taste_suppressor = 3) - required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/water/salt = 1) + required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/sulfur = 1, /datum/reagent/water = 1) mix_message = "The mixture becomes clear like water." /datum/chemical_reaction/medicine/taste_suppressor/maint results = list(/datum/reagent/medicine/taste_suppressor = 3, /datum/reagent/chlorine = 1) // The chlorine dissociated from the sodium to allow for the synthesis of the taste suppressor - required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/water/salt = 2) + required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/water/salt = 1) required_temp = 300 /datum/chemical_reaction/medicine/dermagen