From 1216fc7f950eaeef27651b31d0b077a1b6881bce Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Thu, 12 Oct 2023 02:03:18 -0400 Subject: [PATCH] fixes --- _maps/map_files/generic/CentCom.dmm | 1184 +++++++++-------- .../ghost_players/arena/fight_button.dm | 4 +- 2 files changed, 636 insertions(+), 552 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 6c83e8dbc416..4f9ba921af44 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -454,10 +454,15 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) "cc" = ( -/obj/machinery/hydroponics/constructable/helper, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/hydroponics/constructable{ + self_growing = 1; + self_sustaining = 1; + sustaining_precent = 100; + multi = 15 + }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) "cd" = ( @@ -838,6 +843,10 @@ /obj/machinery/dna_scannernew, /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) +"dQ" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/admin) "dS" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/botany) @@ -1763,6 +1772,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"jf" = ( +/obj/machinery/light/floor/has_bulb, +/obj/machinery/hydroponics/constructable/helper, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/botany) "jk" = ( /obj/machinery/door/poddoor{ id = "XCCQMLoaddoor2"; @@ -2009,6 +2023,7 @@ "kM" = ( /obj/structure/railing/wood, /obj/structure/table/reinforced, +/obj/machinery/splicer, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) "kN" = ( @@ -2711,6 +2726,10 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) +"pg" = ( +/obj/machinery/hydroponics/constructable/helper, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/botany) "pi" = ( /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) @@ -3734,6 +3753,15 @@ dir = 1 }, /obj/structure/table/reinforced, +/obj/item/storage/medkit/regular, +/obj/item/storage/medkit/brute{ + pixel_y = 5; + pixel_x = 5 + }, +/obj/item/storage/medkit/fire{ + pixel_y = 5; + pixel_x = -4 + }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) "ux" = ( @@ -4020,6 +4048,7 @@ /obj/item/reagent_containers/cup/watering_can/advanced, /obj/item/reagent_containers/cup/watering_can/advanced, /obj/item/reagent_containers/cup/watering_can/advanced, +/obj/machinery/infuser, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) "vO" = ( @@ -5914,6 +5943,19 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"FF" = ( +/obj/structure/railing/wood, +/obj/structure/table/reinforced, +/obj/item/storage/medkit/fire{ + pixel_y = 5; + pixel_x = -4 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/regular{ + pixel_x = -7 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "FI" = ( /obj/structure/filingcabinet/filingcabinet, /turf/open/floor/carpet/royalblue, @@ -6202,13 +6244,18 @@ /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin) "GR" = ( -/obj/machinery/hydroponics/constructable/helper, /obj/structure/railing/wood{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/machinery/hydroponics/constructable{ + self_growing = 1; + self_sustaining = 1; + sustaining_precent = 100; + multi = 15 + }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) "GS" = ( @@ -6956,6 +7003,7 @@ }, /obj/structure/table/reinforced, /obj/machinery/light/directional/north, +/obj/machinery/microwave, /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/kitchen) "Kq" = ( @@ -8377,6 +8425,10 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) +"Rc" = ( +/obj/machinery/chem_master/condimaster, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/botany) "Re" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/siding/wood{ @@ -8537,6 +8589,18 @@ /obj/machinery/light/directional/south, /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) +"RU" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/fire{ + pixel_y = 5; + pixel_x = -4 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/regular{ + pixel_x = -7 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "RV" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, @@ -9335,6 +9399,21 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/neon/simple/cyan, /area/centcom/central_command_areas/admin) +"Wv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/storage/medkit/fire{ + pixel_y = 5; + pixel_x = -4 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/regular{ + pixel_x = -7 + }, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/medical) "Wx" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -9374,13 +9453,18 @@ /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) "WJ" = ( -/obj/machinery/hydroponics/constructable/helper, /obj/structure/railing/wood{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/machinery/hydroponics/constructable{ + self_growing = 1; + self_sustaining = 1; + sustaining_precent = 100; + multi = 15 + }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) "WN" = ( @@ -16895,22 +16979,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn aa aa aa @@ -17152,22 +17236,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +KF +KF +KF +KF +KF +SS +Yn +Yn +EZ +EZ +EZ +EZ +EZ +QM +Yn aa aa aa @@ -17409,22 +17493,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +AH +AH +AH +AH +OP +PK +Yn +Yn +Vn +PW +Vn +PW +Vn +zZ +Yn aa aa aa @@ -17666,22 +17750,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +OP +AH +AH +AH +OP +PK +Yn +Yn +Vn +PW +Vn +PW +Vn +zZ +Yn aa aa aa @@ -17923,22 +18007,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +OP +OP +OP +OP +OP +PK +Yn +Yn +Vn +PW +Vn +PW +Vn +zZ +Yn aa aa aa @@ -18180,22 +18264,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +AH +AH +AH +AH +OP +PK +Yn +Yn +Vn +Vn +Vn +Vn +Vn +zZ +Yn aa aa aa @@ -18437,22 +18521,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +XD +XD +XD +XD +XD +Xs +Yn +Yn +Tz +Tz +Tz +Tz +Tz +zE +Yn aa aa aa @@ -18694,22 +18778,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn aa aa aa @@ -18951,22 +19035,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +zM +zM +zM +zM +zM +zs +Yn +Yn +Pv +Pv +Pv +Pv +Pv +ZQ +Yn aa aa aa @@ -19208,22 +19292,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +Se +Si +Se +Se +Se +Tc +Yn +Yn +Pm +Pm +Pm +Xh +Xh +Wt +Yn aa aa aa @@ -19465,22 +19549,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +Se +Si +Se +Si +Se +Tc +Yn +Yn +Xh +Xh +Pm +Xh +Xh +Wt +Yn aa aa aa @@ -19722,22 +19806,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +Se +Si +Se +Si +Se +Tc +Yn +Yn +Xh +Xh +Pm +Xh +Xh +Wt +Yn aa aa aa @@ -19979,22 +20063,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yn +Se +Se +Se +Si +Se +Tc +Yn +Yn +Pm +Pm +Pm +Pm +Pm +Wt +Yn aa aa aa @@ -20236,6 +20320,22 @@ aa aa aa aa +Yn +Vk +Vk +Vk +Vk +Vk +Oq +Yn +Yn +Co +Co +Co +Co +Co +VP +Yn aa aa aa @@ -20265,6 +20365,8 @@ aa aa aa aa +"} +(41,1,1) = {" aa aa aa @@ -20281,8 +20383,6 @@ aa aa aa aa -"} -(41,1,1) = {" aa aa aa @@ -20477,6 +20577,22 @@ aa aa aa aa +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn aa aa aa @@ -20506,6 +20622,8 @@ aa aa aa aa +"} +(42,1,1) = {" aa aa aa @@ -20538,8 +20656,6 @@ aa aa aa aa -"} -(42,1,1) = {" aa aa aa @@ -20563,6 +20679,7 @@ aa aa aa aa +gt aa aa aa @@ -20595,7 +20712,6 @@ aa aa aa aa -gt aa aa aa @@ -20763,40 +20879,8 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(43,1,1) = {" +"} +(43,1,1) = {" aa aa aa @@ -41551,37 +41635,37 @@ Wo wM ij ak +dQ Mc Mc Mc Mc Mc +dQ Mc Mc Mc Mc Mc +dQ Mc Mc Mc Mc Mc +dQ Mc Mc Mc Mc Mc +dQ Mc Mc Mc Mc Mc -Mc -Mc -Mc -Mc -Mc -Mc +dQ Mc On aa @@ -42842,7 +42926,7 @@ pi pi CS Mc -Mc +dQ Mc CS pi @@ -44137,22 +44221,22 @@ eU pi pi Zf -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -44384,7 +44468,7 @@ pi pi CS Mc -Mc +dQ Mc CS pi @@ -44394,22 +44478,22 @@ NK JC pi Zf -Yn -KF -KF -KF -KF -KF -SS -Yn -Yn -EZ -EZ -EZ -EZ -EZ -QM -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -44651,22 +44735,22 @@ pi pi pi Zf -Yn -AH -AH -AH -AH -OP -PK -Yn -Yn -Vn -PW -Vn -PW -Vn -zZ -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -44908,22 +44992,22 @@ SI oT Ly On -Yn -OP -AH -AH -AH -OP -PK -Yn -Yn -Vn -PW -Vn -PW -Vn -zZ -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -45165,22 +45249,22 @@ On On On On -Yn -OP -OP -OP -OP -OP -PK -Yn -Yn -Vn -PW -Vn -PW -Vn -zZ -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -45422,65 +45506,65 @@ AN qm Yj On -Yn -AH -AH -AH -AH -OP -PK -Yn -Yn -Vn -Vn -Vn -Vn -Vn -zZ -Yn -aa -aa -aa -aa -Yn -NE -NE -NE -mD -su -fw -ts -mD -bp -Zv -sE -bH -sE -Zv -VZ -Ya -aa -aa -aa -aa -aa -aa -aa -aa -"} -(139,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Yn +NE +NE +NE +mD +su +fw +ts +mD +bp +Zv +sE +bH +sE +Zv +VZ +Ya +aa +aa +aa +aa +aa +aa +aa +aa +"} +(139,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -45679,22 +45763,22 @@ JQ Tf IU ua -Yn -XD -XD -XD -XD -XD -Xs -Yn -Yn -Tz -Tz -Tz -Tz -Tz -zE -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -45926,7 +46010,7 @@ yC yg CN Mc -Mc +dQ Mc cI IU @@ -45936,22 +46020,22 @@ eo ID Zi ua -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -46193,22 +46277,22 @@ ID ID CR ua -Yn -zM -zM -zM -zM -zM -zs -Yn -Yn -Pv -Pv -Pv -Pv -Pv -ZQ -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -46450,22 +46534,22 @@ eW qe Jo On -Yn -Se -Si -Se -Se -Se -Tc -Yn -Yn -Pm -Pm -Pm -Xh -Xh -Wt -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -46707,22 +46791,22 @@ On On On On -Yn -Se -Si -Se -Si -Se -Tc -Yn -Yn -Xh -Xh -Pm -Xh -Xh -Wt -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -46964,22 +47048,22 @@ cH ki Mk On -Yn -Se -Si -Se -Si -Se -Tc -Yn -Yn -Xh -Xh -Pm -Xh -Xh -Wt -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -47221,22 +47305,22 @@ zX zX zX Zf -Yn -Se -Se -Se -Si -Se -Tc -Yn -Yn -Pm -Pm -Pm -Pm -Pm -Wt -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -47468,7 +47552,7 @@ kl QV kv Mc -Mc +dQ Mc Gt zX @@ -47478,22 +47562,22 @@ pv zX rh Zf -Yn -Vk -Vk -Vk -Vk -Vk -Oq -Yn -Yn -Co -Co -Co -Co -Co -VP -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Yn Yn Yn @@ -47735,22 +47819,22 @@ zX zX zX Zf -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa wc wc nP @@ -47947,7 +48031,7 @@ aa aa aa gL -QN +Rc LK LK LK @@ -48973,7 +49057,7 @@ aa dS dS JF -wO +jf JF dS dS @@ -49487,7 +49571,7 @@ aa dS wO LK -JF +pg JF uS px @@ -50001,7 +50085,7 @@ aa dS dS JF -wO +jf JF dS dS @@ -56945,7 +57029,7 @@ Nb Zz dl Nb -Ca +FF ux vS vR @@ -57717,7 +57801,7 @@ we we Nb YL -uw +Wv vS zp we @@ -58998,7 +59082,7 @@ aa aa aa dl -Dr +RU Nb Nb YL diff --git a/monkestation/code/modules/ghost_players/arena/fight_button.dm b/monkestation/code/modules/ghost_players/arena/fight_button.dm index 4aa53e84e0cf..5bcbb6f429c2 100644 --- a/monkestation/code/modules/ghost_players/arena/fight_button.dm +++ b/monkestation/code/modules/ghost_players/arena/fight_button.dm @@ -138,14 +138,14 @@ player_two.fully_heal() var/obj/item/one_weapon = new weapon_of_choice(src) - var/turf/one_spot = locate(161, 49, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1]) + var/turf/one_spot = locate(148, 34, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1]) player_one.forceMove(one_spot) player_one.equipOutfit(/datum/outfit/job/assistant) player_one.put_in_active_hand(one_weapon, TRUE) player_one.dueling = TRUE var/obj/item/two_weapon = new weapon_of_choice(src) - var/turf/two_spot = locate(177, 49, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1]) + var/turf/two_spot = locate(164, 34, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1]) player_two.forceMove(two_spot) player_two.equipOutfit(/datum/outfit/job/assistant) player_two.put_in_active_hand(two_weapon, TRUE)