cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deconflicts2

Browse Source
This commit is contained in:
Cyantime
2017-09-16 19:03:28 -04:00
parent 68056dd5f2
commit 52c3f014c1
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/engineering_vr.dm
+7
View File
@@ -1,3 +1,10 @@
/datum/supply_packs/eng/thermoregulator
contains = list(/obj/machinery/power/thermoregulator)
name = "Thermal Regulator"
cost = 30
containertype = /obj/structure/closet/crate/large
containername = "thermal regulator crate"
/datum/supply_packs/eng/radsuit
contains = list(
/obj/item/clothing/suit/radiation = 2,
maps/tether/tether-01-surface.dmm
+3 -1
View File
@@ -5545,6 +5545,7 @@
"ccG" = (/obj/structure/table/steel,/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/shuttle_pad)
"ccH" = (/obj/structure/table/steel,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/shuttle_pad)
"ccI" = (/obj/machinery/camera/network/northern_star,/turf/simulated/floor/outdoors/grass/sif/virgo3b,/area/tether/surfacebase/outside/outside3)
"ccJ" = (/obj/machinery/power/thermoregulator,/turf/simulated/floor,/area/engineering/atmos/storage)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaacaacaacaacaacaacaacaacaacaacaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -5741,7 +5742,7 @@ aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaL
aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaGSaWlaWaaWabgvaYFaYFaYFaYFaYFaGSbgwbgxaGSaLMaLMaLMaLMaYibgybgybgzbgAbgzbgybgybgybgBbgCbdHbdHbgDbgEbgFbgEbgDbgGbgHbgIbgJbgKbgLbezbgMbgNbgObgPbgNbgQbexahxahxahxahxbbMbbMbbMbbMbdlbgRbdlbbMbgSbgTbgUbdlbeIbdlbdlbebbbMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK
aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaGSaWlaWaaWabgVaGSbgWbgXbgYbgZbhabhbbhcaGSaLMaLMaLMaLMaLMbgybhdbhebhfbhgbhhbhibgybhjbhkbdHbhlbgDbhmbhnbhobgDbgDbgDbhpbhqbhrbhsbexbhtbhubhvbhwbhxbhybexbhzbhAbhBbhBbhBbhCbhBbgqbgqbgqbhDbbMbhEbhFbhGbdlbhHbhIbhJbhKbbMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK
aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaGSaWlaXaaYbaWaaGSbhLaGSaGSaGSaGSbgwbhMaGSaLMaLMaLMaLMaLMbgybhNbhObhPbhQbhRbhSbgybhTbhUbdHbhVbgDbhWbhXbhYbhZbiabgDbibbicbhrbidbexbexbezbezbezbezbexbexbiebiebiebiebiebiebbMbbMbbMbbMbbMbbMbbMbbMbifbigbihbiibijbbMbbMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK
aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaGSbikaWaaWabilaGSaGSaGSaLMaLMaGSbimbinaGSaLMaLMaLMaLMaLMbgybiobipbiqbirbisbitbgybiubivbdHbiwbgDbixbiybizbiAbiBbiCbiDbiEbiFbiGbiHbiIbiJbiJbiJbiJbiJbiKbiebiLbiMbiNbiNbieaLMaLMaLMaLMaLMaLMaLMbbMbiObbObbMbbMbbMbbMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK
aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaGSbikaWaaWabilaGSaGSaGSaLMaLMaGSbimbinaGSaLMaLMaLMaLMaLMbgybiobipbiqbirbisbitbgybiubivbdHbiwbgDbixbiybizbiAbiBbiCbiDbiEbiFbiGbiHbiIbiJbiJbiJbiJbiJbiKbiebiLbiMbiNccJbieaLMaLMaLMaLMaLMaLMaLMbbMbiObbObbMbbMbbMbbMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK
aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaGSbiPbiQbiRbiRaGSaLMaLMaLMaLMaGSbgwbhMaGSaLMaLMaLMaLMaLMbgybiSbiTbiUbiVbiWbiXbgybiYbiZbdHbjabgDbjbbjcbjdbjebjfbgDbjgbjhbjibjjbjkbjkbjkbjkbjlbjlbjmbjnbjobjpbjqbjrbjsbieaLMaLMaLMaLMaLMaLMaLMbbMbjtbdlbbMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK
aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaGSaGSaGSaGSaGSaGSaLMaLMaLMaLMaGSbgwbhMbjubjubjubjubjubjubgybgybgybgybgybgybgybgybjvbjwbjxbjxbjxbjxbjxbjxbjxbjxbjxbjxbjybjzbjAbjxbjxbjxbjxbjxbjxbjxbdHbiebjBbjqbjrbjrbieaLMaLMaLMaLMaLMaLMaLMbbMbjtbbMbbMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK
aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaGSbgwbhMbjubjCbjDbjEbjFbjGbjuaLMbjxbjHbjIbjJbjKbjLbjMbjNbjObjPbjQbjRbjSbjTbjUbjVbjWbjXbjYbjZbkabjPbkbbkcbkdbkebkfbjxaLMbiebkgbjqbjqbkhbieaLMaLMaLMaLMaLMaLMaLMbbMbjtbbMbkiaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK
@@ -5914,3 +5915,4 @@ bsobspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbs
bsobspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbspbso
bsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobsobso
"}