cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-26 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #615 from ArchieBeepBoop/pets

Browse Source 
Energy Harvester Fixes + HoS Pet to Active Rotation Stations
This commit is contained in:
QuoteFox
2020-10-27 02:36:23 +00:00
committed by GitHub
parent 88bf85f2ea 84c8e0b5c9
commit 9c13864b8b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+5 -1
View File
@@ -62818,6 +62818,10 @@
/obj/machinery/bloodbankgen,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"xSM" = (
/mob/living/simple_animal/hostile/carp/cayenne/lia,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
"xYc" = (
/obj/item/crowbar,
/obj/item/wrench,
@@ -97342,7 +97346,7 @@ aad
abn
abJ
acb
aca
xSM
aca
adJ
abm
_maps/map_files/PubbyStation/PubbyStation.dmm
+2 -1
View File
@@ -6074,6 +6074,7 @@
"eAp" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/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,/area/hallway/secondary/exit/departure_lounge)
"eCw" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plating,/area/maintenance/department/cargo)
"eCK" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/department/cargo)
"eCL" = (/mob/living/simple_animal/hostile/carp/cayenne/lia,/turf/open/floor/carpet,/area/crew_quarters/heads/hos)
"eDC" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plasteel,/area/construction/mining/aux_base)
"eEp" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4},/turf/open/floor/wood,/area/lawoffice)
"eFj" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel/white,/area/medical/sleeper)
@@ -7074,7 +7075,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaitaiVaiWaiXaiYaiuafUafUafUafUaiZajaajbaiAajcajcajcagyajdajeajfagyagyagyahLajgajQajRajSajjahLajkajlajmajnajoajpbgOagPajrajsajsajsajsajsbhrajsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahtcdmaaaahtahsahtaaaaaaaaaaaaaaaaaaaaaaiSeqDalbcBwnoCtapalbcPOaiSaiSaiSaiTajxajyajyajyajzaiTaiSaiSaiTaiTaiTaiSaiSaiSaiTaiTaiTaiSaiSaiSaiSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaitajBajCajDajEaiuajFajGajGaiuaiuajIaiuaiAagyagyagyagyajJajKajLajMajNajOahLaQyakMakNakOajTahLajUajVajWajWajXajYbgPagPaiRajsakaakbakcakdbhwajsajsahiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahtcdmahtahtahRahtaaaaaaaaaaaaaaaaaaaaaaiToMNgnagNvaiSaiSanmaiSaiSakjcBxacaakmaknakoaknakkaffcByaknaknaknaknaknaknaknaknaknaknaaBaknasnaiSabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiuakrajDaksaktaiuakuakvakwaiuakxakyakzakAakBakCakDakEakFakGakHaaeakJakKahLakLakMaiMakOakPahLakQajVajVajVajVajVbgQcCSakTakUakVakWakXakXakXakZabIahiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahtcdmaaaahtalaahtaaaaaaaaaaaaaaaaaaaaaaiSvlFklVnnhaiSanYajvaiSaobaleaiSaiTalfalgalgalgalhaiTaiSaiSaaFaaFaaFaiSaiSaiSaaFaaFaaFaiSaiSaleaiSabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiuaiualiaiuaiuaiualjalkallaiualmalnaloalpalqalralsaltalualvalwalxalyalzahLalAakMaiMakOalAahLalBalCalDalEalCalFbgRalHaiRafyalJalKalLalJalMalNabIahiaaaaaaaaaaaaaaaaaaahtahtahtahtahtahtahtahtahtahtahtcdmahtalOahtahtaaaaaaaaaaaaaaaaaaaaaaiTtvjxbJsqhaiSaptajvaiSeawaleaiSaaaaaaaaaaaaaaaaaaaaaaaZabdakqanpaqZaslasmbkkatoauoatnaupaiSaleaiSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiuaiualiaiuaiuaiualjalkallaiualmalnaloalpalqalralsaltalualvalwalxalyalzahLalAakMaiMakOalAahLalBalCalDalEalCalFbgRalHaiRafyeCLalKalLalJalMalNabIahiaaaaaaaaaaaaaaaaaaahtahtahtahtahtahtahtahtahtahtahtcdmahtalOahtahtaaaaaaaaaaaaaaaaaaaaaaiTtvjxbJsqhaiSaptajvaiSeawaleaiSaaaaaaaaaaaaaaaaaaaaaaaZabdakqanpaqZaslasmbkkatoauoatnaupaiSaleaiSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahtaitajDaitaaaaiualTalUalVaiualWalXalYakAalZamaambamcamdameamfamgamgamgamgamhamiamjamkamjamlammamnamoampamnamqbgTamsaafafPamvamwamxamyamzalNabIahiaaaaaaaaaaaaaaaaaaamAamBamCamCamCamBamCamCamCamCamBamCamDahtaaaahtaaaaaaaaaaaaaaaaaaaaaaiSaiTaiSaiTaiSsbkajuaiSajvaleaiTaaaaaaaaaaaaaaaaaaaaaawzauqavmavmavmavmavnavmavmavmawwawyaaFaleaiTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyahtaiuaiuaiuaiuaiuahtahtaitajDaitaaaaiuskwamHtfZaiuamIamJamKakAamLamMamNamOamPamQamRamgamSamTamUamVamWamXamYamZanaanbalCancandalCaneanfalHaiRafVanhaniabHalJankalNabIahiaaaaaaaaaaaaaaaanlahtahtahtahtahtahtahtahtahtahtahtcdmahtahtahtahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiSaiSajvaiSajvaleaiTaaaaaaaaaaaaaaaaaaaaaawzawAawBawCawCawCawDawCawCawCaxvawyaaFaleaiTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaedaaaaitfINoFflcUaiuaiuaiuaiuanqaiuaiuaiuanransvCCantanuanvanwakAanxakAajMajManyanzanAanBanCanDanEanFanGanHanIanJanKanLalEanMandalEanNanOanPanQanRanSjvianUanVanTanWabIahiaaaaaaaaaaaaanlaaaahtaaaaaaaaaahtaaaaaaaaaahtaaaahtcdmaaaaaaaaaahtaaaaaaaaaaaacBUlcZcBUlcZcBUaaaaaaaiTalPcBAaiScnXaleaiTaaaaaaaaaaaaaaaaaaaaaawzaxwaxxaxzaxAayuayuayuaxAayuayvawyaaFaleaiTabIaaaaaaaaaaaaabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa