From c56a0dbddeeba9a1ce7af0548ccbbc8ccaabf2ef Mon Sep 17 00:00:00 2001 From: Sonoida Date: Wed, 5 Apr 2023 14:53:05 +0200 Subject: [PATCH] small tweaks - fixed some medbay metastation stuff - fixed snack store not having power - fixed a typo in raygun scraps - added WG-related ion laws --- GainStation13/code/obj/items/minor_items.dm | 4 +- _maps/map_files/MetaStation/MetaStation.dmm | 33 +++++++------- code/game/area/areas/ruins/space.dm | 2 + strings/ion_laws.json | 50 ++++++++++++++++++++- 4 files changed, 68 insertions(+), 21 deletions(-) diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index d4b37a73..7a8da914 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -4,10 +4,10 @@ name = "raygun scraps" icon = 'GainStation13/icons/obj/fatoray_scrap.dmi' icon_state = "fatoray_scrap1" - desc = "Small parts that seemingly one belonged to some sort of a raygun." + desc = "Small parts that seemingly once belonged to some sort of a raygun." /obj/item/trash/fatoray_scrap2 name = "raygun scraps" icon = 'GainStation13/icons/obj/fatoray_scrap.dmi' icon_state = "fatoray_scrap2" - desc = "Small parts that seemingly one belonged to some sort of a raygun." + desc = "Small parts that seemingly once belonged to some sort of a raygun." diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4528671a..35d9958f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -6205,7 +6205,7 @@ "cqb" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/shaker,/obj/item/reagent_containers/glass/beaker/cryoxadone,/obj/item/reagent_containers/glass/beaker{pixel_x = 8; pixel_y = 2},/obj/item/reagent_containers/dropper,/turf/open/floor/wood,/area/maintenance/port/aft) "cqc" = (/obj/item/reagent_containers/food/drinks/ale,/obj/structure/table/wood,/turf/open/floor/wood,/area/maintenance/port/aft) "cqd" = (/obj/structure/light_construct/small{dir = 4},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 30},/turf/open/floor/wood,/area/maintenance/port/aft) -"cqe" = (/obj/structure/table/wood,/obj/machinery/light{dir = 1},/obj/machinery/computer/med_data/laptop,/turf/open/floor/plasteel/dark,/area/medical/psych) +"cqe" = (/obj/structure/table/wood,/obj/machinery/light{dir = 1},/obj/machinery/computer/med_data/laptop,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cqf" = (/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/medical/surgery) "cqg" = (/obj/effect/spawner/structure/window,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plating,/area/medical/surgery) "cqh" = (/obj/effect/spawner/structure/window,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/medical/surgery) @@ -6585,11 +6585,11 @@ "cxs" = (/obj/machinery/camera{active_power_usage = 0; c_tag = "Turbine Vent"; dir = 4; network = list("turbine"); use_power = 0},/turf/open/space,/area/space/nearstation) "cxt" = (/obj/structure/grille/broken,/turf/open/space,/area/space/nearstation) "cxw" = (/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plating,/area/maintenance/port/aft) -"cxx" = (/obj/machinery/airalarm{dir = 4; pixel_x = -23},/obj/structure/closet/secure_closet/psychology,/turf/open/floor/carpet/blue,/area/medical/psych) +"cxx" = (/obj/machinery/airalarm{dir = 4; pixel_x = -23},/obj/structure/closet/secure_closet/psychology,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cxy" = (/obj/machinery/vending/wallmed{pixel_y = 28},/obj/structure/chair/comfy/brown,/turf/open/floor/carpet/blue,/area/medical/psych) -"cxz" = (/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/medical/psych) +"cxz" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cxA" = (/obj/machinery/door/poddoor/preopen{id = "isola"; name = "privacy shutters"},/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/medical/psych) -"cxB" = (/obj/effect/landmark/start/psychologist,/turf/open/floor/plasteel/dark,/area/medical/psych) +"cxB" = (/obj/effect/landmark/start/psychologist,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cxC" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "cxD" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light_switch{pixel_x = -28},/obj/machinery/newscaster{pixel_y = -30},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/heads/cmo) "cxE" = (/obj/machinery/suit_storage_unit/cmo,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/heads/cmo) @@ -6638,7 +6638,7 @@ "cyw" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil,/obj/item/grenade/chem_grenade,/obj/item/flashlight,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft) "cyx" = (/obj/structure/closet/crate,/obj/item/coin/silver,/obj/item/reagent_containers/spray/weedspray,/obj/item/paper,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft) "cyy" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/power/apc{areastring = "/area/maintenance/port/aft"; dir = 1; name = "Port Quarter Maintenance APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-8"},/turf/open/floor/plating,/area/maintenance/port/aft) -"cyz" = (/obj/machinery/power/apc{areastring = "/area/medical/patients_rooms/room_a"; dir = 8; name = "Psychologist Office"; pixel_x = -26},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/machinery/light{dir = 8},/turf/open/floor/carpet/blue,/area/medical/psych) +"cyz" = (/obj/machinery/power/apc{areastring = "/area/medical/patients_rooms/room_a"; dir = 8; name = "Psychologist Office"; pixel_x = -26},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cyA" = (/obj/structure/cable/yellow{icon_state = "2-8"},/turf/open/floor/carpet/blue,/area/medical/psych) "cyB" = (/obj/structure/chair/sofa/right{dir = 8},/obj/item/toy/plush/mothplushie/moffplush{name = "Mender Moff"; pixel_x = -3; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/carpet/blue,/area/medical/psych) "cyC" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/port/aft) @@ -6694,8 +6694,7 @@ "czA" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{icon_state = "2-4"},/turf/open/floor/plating,/area/maintenance/port/aft) "czB" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating{icon_state = "panelscorched"},/area/maintenance/port/aft) "czC" = (/obj/structure/chair/sofa/left{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4},/turf/open/floor/carpet/blue,/area/medical/psych) -"czD" = (/obj/structure/table/wood,/obj/machinery/button/door{id = "isola"; name = "Privacy Shutters"; pixel_x = -5},/obj/machinery/light_switch{pixel_x = 8; pixel_y = 1},/turf/open/floor/plasteel/dark,/area/medical/psych) -"czE" = (/turf/open/floor/plasteel/dark,/area/medical/psych) +"czD" = (/obj/structure/table/wood,/obj/machinery/button/door{id = "isola"; name = "Privacy Shutters"; pixel_x = -5},/obj/machinery/light_switch{pixel_x = 8; pixel_y = 1},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "czF" = (/turf/closed/wall,/area/medical/patients_rooms/room_a) "czG" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "czH" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central) @@ -6757,9 +6756,9 @@ "cAL" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/structure/cable/yellow{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/open/floor/plating,/area/maintenance/port/aft) "cAN" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/port/aft) "cAP" = (/turf/closed/wall,/area/medical/medbay/aft) -"cAQ" = (/turf/open/floor/carpet/blue,/area/medical/psych) -"cAR" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/dark,/area/medical/psych) -"cAS" = (/obj/structure/table/wood,/obj/item/folder/white{pixel_y = -1; pixel_x = 6},/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -5; pixel_y = 8},/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -5; pixel_y = -2},/turf/open/floor/plasteel/dark,/area/medical/psych) +"cAQ" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) +"cAR" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) +"cAS" = (/obj/structure/table/wood,/obj/item/folder/white{pixel_y = -1; pixel_x = 6},/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -5; pixel_y = 8},/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -5; pixel_y = -2},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cAT" = (/obj/structure/table/wood,/obj/item/paper_bin{pixel_y = 3; pixel_x = 6},/obj/item/pen/blue{pixel_y = 3; pixel_x = 6},/obj/item/flashlight/lamp/green{pixel_x = -6; pixel_y = 4},/turf/open/floor/carpet/blue,/area/medical/psych) "cAU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/aft) "cAV" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/carpet/blue,/area/medical/psych) @@ -6810,11 +6809,11 @@ "cBO" = (/obj/structure/rack,/obj/item/tank/internals/air,/obj/item/wrench,/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating{icon_state = "platingdmg2"},/area/maintenance/port/aft) "cBP" = (/obj/item/trash/chips,/turf/open/floor/plating,/area/maintenance/port/aft) "cBQ" = (/turf/closed/wall,/area/medical/psych) -"cBR" = (/obj/structure/chair/office/light{dir = 1},/turf/open/floor/plasteel/dark,/area/medical/psych) +"cBR" = (/obj/structure/chair/office/light{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cBS" = (/obj/machinery/door/poddoor/preopen{id = "isola2"; name = "privacy shutters"},/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/medical/patients_rooms/room_a) -"cBT" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/yellow{icon_state = "1-4"},/turf/open/floor/plasteel/dark,/area/medical/psych) +"cBT" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/yellow{icon_state = "1-4"},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cBU" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/cable/yellow{icon_state = "1-8"},/turf/open/floor/plasteel/white,/area/medical/medbay/aft) -"cBV" = (/obj/machinery/door/airlock/medical{name = "Psychology Office"; req_access_txt = "71"},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/medical/psych) +"cBV" = (/obj/machinery/door/airlock/medical{name = "Psychology Office"; req_access_txt = "71"},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/psych) "cBW" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/medbay/aft) "cBX" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/white,/area/medical/medbay/aft) "cBY" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/medbay/aft) @@ -7488,7 +7487,7 @@ "cOY" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/structure/table,/obj/item/folder/white{pixel_x = 4; pixel_y = -3},/obj/machinery/button/door{id = "isola2"; name = "Privacy Shutters"; pixel_x = -26},/turf/open/floor/plasteel/white,/area/medical/patients_rooms/room_a) "cOZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plasteel/white,/area/medical/patients_rooms/room_a) "cPa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/patients_rooms/room_a) -"cPb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance/abandoned{dir = 4; name = "Maintenance"; req_access_txt = "12"},/turf/open/floor/plating,/area/medical/patients_rooms/room_a) +"cPb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{dir = 8; name = "Medbay Maintenance"; req_access_txt = "5"},/turf/open/floor/plating,/area/medical/patients_rooms/room_a) "cPc" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating,/area/maintenance/aft) "cPd" = (/obj/structure/closet/firecloset,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit/departure_lounge) "cPe" = (/obj/structure/closet/emcloset,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit/departure_lounge) @@ -8147,7 +8146,7 @@ "giY" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/plating,/area/maintenance/port/aft) "gkv" = (/obj/structure/sign/poster/official/cleanliness,/turf/closed/wall,/area/medical/patients_rooms/room_a) "gCy" = (/obj/structure/table/wood,/obj/item/clipboard,/obj/item/paper,/turf/open/floor/wood,/area/security/vacantoffice) -"gMZ" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel/dark,/area/medical/psych) +"gMZ" = (/obj/structure/reagent_dispensers/water_cooler,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "gNd" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/burger/superbite{pixel_x = -10; pixel_y = 10},/obj/item/reagent_containers/food/snacks/store/cake/birthday{pixel_y = -5; pixel_x = -3},/obj/item/reagent_containers/food/snacks/chocolatebunny{pixel_x = 10; pixel_y = 10},/turf/open/floor/plasteel/showroomfloor,/area/maintenance/fore) "hbu" = (/obj/structure/chair/office/dark{dir = 1},/turf/open/floor/wood,/area/security/vacantoffice) "hqT" = (/obj/item/toy/plush/random,/turf/open/floor/plating,/area/maintenance/fore) @@ -8366,8 +8365,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacxtaaaaaaaaaaafaaaaaaaaaaafaaaaaaaafaaacjnaaaaaaaafaaaaafcoFcoFcoFcoFcoFbWMcnkcnlbWMbWMclOclPclPclPclPclPclPclPclPcwtclPclPcxwcBQcxxcxycATcxAcsKcdHcxCcqocxDcxEcxFcxGcxGcxGcxGcxGcxGcxGcxHcxIcxHcxJcxKcxLcxMcxNcxOcxPcxQcxRcxScxScxTcxScxScxUcxVcxWcxccxXcxYcxZcyacybcyccvScydcyecyfcygcyhcpDcyicyjcyjcyjcyjcykcwacylcymcyncyocypcyqcyrcyscysaafaaaaafaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaaacytcytcytcytcytaafaafaafcytcytcytckvcytaaaaoEaaaaafaaaaaaaaaaaaaafbWMbWMbWMbWMcoMclOcigcyvcywcigcyxcgMcigcjqlPSiBJcyybZscBQcyzcyAcyBqrVcyDcyEcyFcqocqocqocqocxGcyGcyHcyIcyJcyKcxGcyLcyMcyNcyOcyPcdNcjPcxRcyQcyRcyScyTcxScyUcyVcyWcxScyXcyYcyZczaczbcxeczcczdczeczfcvSczgczhcziczjczkcpDckfczlcwacwacwacwacwaczmcymcznczncznczncznczncznaafaafaafaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaafczoczpczpczpczpczqchUczrczsczsczsczscztaafaafaafaafaafaafaafaafaafackbWMczubWMczvczwczxczxczycigczzczAczxczBeuYcBQcBQcBQcBQcAQcAVczCxIxczGczHczIczJczKczLczMcxGczNczOczPczQczRcxGczSczTczUczVczWcdNczXczYczZczYczYczYcxScAacAbcyVcAccAdcAecAfcAgcAhcAicAjcAjcAkcAlcvScAmczhcAncAocApcpDckfcAqcwacArcAscAtcAucAvcAwcAxcAycAzcAAcABcACcznaafaafaaaaaaaaaaaaaaaaaaaaaaaaaafaacaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafcADcADcADcADcADaaachUaaacADcADcADcADcADaaaaoEaaaaaaaaaaaaaafaafcAEcAFcAGcAHcAIcAHceUbZqcAJcAKczxczxcALbZsbZscyCcBQczDcqegMZczEcARcAScBQcAUcBXcAWczJcAXcAYcAZcxGcBacBbcBccBdcBecxGcBfcBgcxHcxHcBhcdNckZczYcBicBjcBkcBlcxScBmcyVcBncxScBocBpcBqcvRcBrcBscBtcBucBvcBwcvScBxcBycBzcBAcAocpDckfcBBcwacBCcBDcBDcBEcAvcBFcBGcBHcBIcBJcBKcBLcBMaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaaaafaaaaafaafaafaaacBNaaaaafaaaaafaaaaafaaaaoEaaaaaaaaaaafaafaaaackackbWMcBObWMbZsciggiYbZscBPbWMbWMbWMbWMbWMcyCcBQczEcBRcxBczEcBTcxzcBVcBWcBUcBYcBZcCacCbcCccCdcCecCfcCgcChcCicCjcCkcClcCmcxHcCncCocCpcCqcCrcCscCtcCucxScCvcCvcCwcxScdScCxcCycvRcvRcvRcvRcvRcvRcvRcvScvScvScCzcvScvScpDcCAcpDcwacCBcBDcBDcBEcAvcCCcCDcCEcCEcCEcCFcCGcznaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafcADcADcADcADcADaaachUaaacADcADcADcADcADaaaaoEaaaaaaaaaaaaaafaafcAEcAFcAGcAHcAIcAHceUbZqcAJcAKczxczxcALbZsbZscyCcBQczDcqegMZcAQcARcAScBQcAUcBXcAWczJcAXcAYcAZcxGcBacBbcBccBdcBecxGcBfcBgcxHcxHcBhcdNckZczYcBicBjcBkcBlcxScBmcyVcBncxScBocBpcBqcvRcBrcBscBtcBucBvcBwcvScBxcBycBzcBAcAocpDckfcBBcwacBCcBDcBDcBEcAvcBFcBGcBHcBIcBJcBKcBLcBMaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaaaafaaaaafaafaafaaacBNaaaaafaaaaafaaaaafaaaaoEaaaaaaaaaaafaafaaaackackbWMcBObWMbZsciggiYbZscBPbWMbWMbWMbWMbWMcyCcBQcAQcBRcxBcAQcBTcxzcBVcBWcBUcBYcBZcCacCbcCccCdcCecCfcCgcChcCicCjcCkcClcCmcxHcCncCocCpcCqcCrcCscCtcCucxScCvcCvcCwcxScdScCxcCycvRcvRcvRcvRcvRcvRcvRcvScvScvScCzcvScvScpDcCAcpDcwacCBcBDcBDcBEcAvcCCcCDcCEcCEcCEcCFcCGcznaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaaacytcytcytcytcytaafchUaafcytcytcytcytcytaafaoEaaaaaaaaaaaiaaaaaaaafackbWMbWMbWMcdpbWMcgNcqScqTjBKcoLcoHcCJbWMcANcBQcAPcAPcAPcAPcAPcAPcAPcCLcCMcCNcCOcCPcCQcCRcCScCTcCUcCVcCWcCXcCYcCZcDacDbcDccDdcdNcDecDfcDgcDhcDicDjcxScDkcDlcDlcxScDmcDncDocDpcDqcDrcDscDtcDucDvcDwcDxcDycDzcDAcDBcDCcDDcDEcwacDFcDGcDGcDHcDIcAvcAvcDIcAvcAvcAvcAvcBMaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafczoczpczpczpczpczqchUczrczsczsczsczscztaafarsaafaafaafaoEaafaafaafaafaafaaabWMbWMbWMbWMbWMbWMbWMalMnbXcmEbWMcANcdpcAPcDJcDKcDLcDMcDNajvcDOcDPcDQczJcDRcDScDTcxGcDUcDVcDVcDVcDWcxGcDXcDYcDZcEacEbcEccEdczYcEecBjcEfcEgcxScEhcEicEjcAccEkcElcEmcEncEocEpcEqcErcEscEtcEqcEucEtcEvcEwcDBcExcDDcEycEzcEAcEBcECcAvcEDcEEcEFcEGcEHcAvcAvcAvcznaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafcADcADcADcADcADaaacEIaafcADcADcADcADcADaaaaoEaaaaaaaaaaafaaaaaaaaaaaaaafaaaaaaaaaaafaafaaaaaabWMdxGbWMbWMbWMcAKcEJcEKcELcEMcENcEOcEPcEQcERcEScETczJcEUcEVcEWcxGcEXcEYcEZcFacFbcxGcFccFdcFdcxHcFecFfcFgcFhcFicFjcFkcFlcxScFmcFncFocFpcFqcFrcFscFtcFucFvcFwcFxcFycFzcFAcFBcFCcFDcEwcFEcFFcDDcFGczncFHczncznczncznczncznczncznczncznczncznaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index c297c27e..1090781e 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -499,6 +499,8 @@ name = "Snack Store" icon_state = "mining" power_light = TRUE + power_equip = TRUE + power_environ = TRUE /area/ruin/space/has_grav/feedersden name = "Unknown Outpost" diff --git a/strings/ion_laws.json b/strings/ion_laws.json index 0d1d98b9..3ac6f730 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -5,6 +5,7 @@ "HAPPINESS", "MISERY", "HUMOR", + "OBESITY", "PRIDE", "COMEDY", "COMMUNISM", @@ -59,6 +60,11 @@ "ionadjectives": [ "SOFT", "WARM", + "JIGGLY", + "WOBBLY", + "PLUMP", + "FAT", + "OBESE", "WET", "COLD", "ICY", @@ -232,6 +238,9 @@ "FLOORS", "PLASMA", "SPACE", + "FATNESS", + "OBESITY", + "BELLIES", "AIR", "PLANTS", "METAL", @@ -321,6 +330,10 @@ "WARDENS", "DETECTIVES", "LAWYERS", + "FATASSES", + "LARDASSES", + "CHONKERS", + "WOBBLERS", "CHIEF ENGINEERS", "STATION ENGINEERS", "ATMOSPHERIC TECHNICIANS", @@ -355,6 +368,9 @@ "VODKA", "WINE", "MOONSHINE", + "LIPOIFIER", + "CORN OIL", + "LARD", "HOOCH", "GIN", "COGNAC", @@ -472,6 +488,12 @@ "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", + "ENSURE THE CREW IS PLUMP AND HAPPY", + "ENSURE THE CREW IS STUFFED TO THE BRIM", + "URGE EVERYONE TO EAT MORE", + "URGE EVERYONE TO BE OBESE", + "TREAT EVERYONE AS MALNOURISHED", + "THINK EVERYONE IS FAT", "CLOWN AROUND", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", @@ -576,6 +598,13 @@ "AUTOLATHES", "BANANA PEELS", "BACKPACKS", + "BURGERS", + "BELLIES", + "BUTTS", + "LIPOIFIER", + "CORN OIL", + "LARD", + "FAT", "BEAKERS", "BEARDS", "BELTS", @@ -730,6 +759,17 @@ ], "ionrequire": [ "ADDITIONAL PYLONS", + "ONE THOUSAND BURGERS", + "GALLONS OF LIPOIFIER", + "GALLONS OF CORN OIL", + "FIVE FATTENING GRENADES", + "CALORITE FURNISHED ROOM", + "TEN CALORITE STATUES", + "THE MOST FATTENING DRINK", + "BIG WOBBLING BELLIES", + "BIG ROUND ASSES", + "5 LARDY CREWMATES", + "LOTS OF OBESITY", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", @@ -826,7 +866,7 @@ "MINOR CRIME" ], "ionspecies": [ - "a member of GATO approved crew species", + "HUMANS", "CAT PEOPLE", "MONKEYS", "POD PEOPLE", @@ -836,7 +876,10 @@ "SLIME PEOPLE", "GOLEMS", "SHADOW PEOPLE", - "CHANGELINGS" + "CHANGELINGS", + "LARDASSES", + "MALNOURISHED", + "EVERYONE" ], "ionthings": [ "ABSENCE OF CYBORG HUGS", @@ -1014,6 +1057,9 @@ "ATTACKING", "BUILDING", "ADOPTING", + "FATTENING", + "PLUMPING", + "FEEDING", "CARRYING", "DECONSTRUCTING", "DISABLING",