From 55dd5d10aedc9e8fa2659a0204df4e9fb75c1c3d Mon Sep 17 00:00:00 2001 From: evilew Date: Sat, 23 Dec 2023 14:21:16 +0100 Subject: [PATCH] small fixes - added stuff for feederden botany - small gato lore naming tweak - engie hardsuits have slightly higher rad res - small naming fix in fatty_drinks - fixed a runtime with calorite tiles (also fixing calorite not popping up on scanners in xenoarch) - couple more job titles related to med --- .../modules/reagents/chemistry/reagents/fatty_drinks.dm | 4 ++-- _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 2 +- code/game/objects/items/manuals.dm | 2 +- code/modules/clothing/spacesuits/hardsuit.dm | 8 ++++---- code/modules/jobs/job_types/job_alt_titles.dm | 6 +++--- code/modules/research/xenoarch/strange_rock.dm | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm index ed82a1a4..29a3562a 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm @@ -53,7 +53,7 @@ shot_glass_icon_state = "shotglassgold" hydration = 4 -/datum/reagent/consumable/snakebite/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/beltbuster_mead/on_mob_life(mob/living/carbon/M) if(M && M?.client?.prefs.weight_gain_chems) // GS13 M.nutrition += 30 * REAGENTS_METABOLISM else @@ -122,4 +122,4 @@ M.nutrition += 25 * REAGENTS_METABOLISM else M.nutrition += 1 - ..() \ No newline at end of file + ..() diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index de35893f..6d75ff25 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -20,7 +20,7 @@ "de" = (/obj/structure/sign/poster/contraband/donut_corp{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) "dl" = (/obj/structure/rack/shelf,/obj/item/stack/sheet/glass/fifty,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/mineral/titanium/fifty{pixel_x = -4; pixel_y = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "dr" = (/obj/machinery/door/airlock/external,/obj/effect/turf_decal{dir = 8},/obj/effect/turf_decal{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"dv" = (/obj/machinery/hydroponics/constructable,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"dv" = (/obj/machinery/chem_dispenser/mutagensaltpeter,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "dz" = (/obj/structure/rack,/obj/item/mop/advanced,/obj/item/storage/bag/trash,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/item/storage/box/lights/mixed,/obj/structure/window/reinforced/tinted{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "dA" = (/obj/structure/toilet{dir = 8},/obj/machinery/light/small{dir = 4; light_color = "#d8b1b1"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "dC" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/machinery/deepfryer,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index b1242198..f7644337 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -300,7 +300,7 @@ /obj/item/book/manual/wiki/security_space_law name = "Space Law" - desc = "A set of Kin-Station guidelines for keeping law and order on their space stations." + desc = "A set of GATO-Station guidelines for keeping law and order on their space stations." icon_state = "bookSpaceLaw" author = "GATO PMC" title = "Space Law" diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index ed85427f..5c9afd48 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -167,7 +167,7 @@ desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." icon_state = "hardsuit0-engineering" item_state = "eng_helm" - armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75) + armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 80, "fire" = 100, "acid" = 75) item_color = "engineering" resistance_flags = FIRE_PROOF @@ -176,7 +176,7 @@ desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." icon_state = "hardsuit-engineering" item_state = "eng_hardsuit" - armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75) + armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 80, "fire" = 100, "acid" = 75) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine resistance_flags = FIRE_PROOF tauric = TRUE //Citadel Add for tauric hardsuits @@ -211,7 +211,7 @@ icon_state = "hardsuit0-white" item_state = "ce_helm" item_color = "white" - armor = list("melee" = 40, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 50, "bio" = 100, "rad" = 90, "fire" = 100, "acid" = 90) + armor = list("melee" = 40, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 50, "bio" = 100, "rad" = 95, "fire" = 100, "acid" = 90) heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT @@ -220,7 +220,7 @@ name = "advanced hardsuit" desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish." item_state = "ce_hardsuit" - armor = list("melee" = 40, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 50, "bio" = 100, "rad" = 90, "fire" = 100, "acid" = 90) + armor = list("melee" = 40, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 50, "bio" = 100, "rad" = 95, "fire" = 100, "acid" = 90) heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/elite diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm index b72fdf16..2ed2bf54 100644 --- a/code/modules/jobs/job_types/job_alt_titles.dm +++ b/code/modules/jobs/job_types/job_alt_titles.dm @@ -17,7 +17,7 @@ alt_titles = list("Civilian", "Morale Officer", "Stripper", "Off-Duty", "Escort", "Visitor", "Businessman", "Trader", "Entertainer", "Tourist") /datum/job/cook - alt_titles = list("Cook", "Culinary Artist", "Butcher", "Chef de partie", "Poissonier", "Baker") + alt_titles = list("Cook", "Culinary Artist", "Butcher", "Chef de partie", "Poissonier", "Baker", "Taste Tester") /datum/job/hydro alt_titles = list("Gardener", "Herbalist", "Botanical Researcher", "Hydroponicist", "Farmer", "Beekeeper", "Vintner") @@ -26,7 +26,7 @@ alt_titles = list("Journalist", "Librarian", "Keeper") /datum/job/chaplain - alt_titles = list("Priest", "Priestess", "Bishop", "Prior", "Monk", "Nun", "Counselor") + alt_titles = list("Priest", "Priestess", "Prior", "Monk", "Nun", "Counselor") /datum/job/janitor alt_titles = list("Custodian", "Sanitation Technician", "Maid", "Trash Can", "Disposal Unit") @@ -60,7 +60,7 @@ alt_titles = list("Medical Director", "Medical Administrator") /datum/job/doctor - alt_titles = list("Nurse", "Surgeon", "Physician", "Paramedic") + alt_titles = list("Nurse", "Surgeon", "Physician", "Paramedic", "Trophologist", "Nutritionist") /datum/job/chemist alt_titles = list("Pharmacist", "Pharmacologist") diff --git a/code/modules/research/xenoarch/strange_rock.dm b/code/modules/research/xenoarch/strange_rock.dm index 8980f25e..23f12051 100644 --- a/code/modules/research/xenoarch/strange_rock.dm +++ b/code/modules/research/xenoarch/strange_rock.dm @@ -130,6 +130,6 @@ /turf/closed/mineral/bscrystal/volcanic = 1, /turf/closed/mineral/gibtonite/volcanic = 2, /turf/closed/mineral/iron/volcanic = 40, - /obj/item/stack/ore/calorite = 1, + /turf/closed/mineral/calorite = 1, /turf/closed/mineral/strange = 15)