cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 00:47:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-08-04 22:19:20 +03:00
parent 1784bf4669 193e15c224
commit 56ac9238cd
6 changed files with 1138 additions and 1101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink/hardsuit_modules.dm
+1 -1
View File
@@ -14,7 +14,7 @@
item_cost = 5
path = /obj/item/rig_module/fabricator/energy_net
/datum/uplink_item/item/ewar_voice
/datum/uplink_item/item/hardsuit_modules/ewar_voice
name = "Electrowarfare Suite and Voice Synthesiser"
item_cost = 6
path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice
code/game/objects/items/devices/uplink_random_lists.dm
+1 -1
View File
@@ -83,7 +83,7 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra
items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/thermal, reselect_propbability = 15)
items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/energy_net, reselect_propbability = 15)
items += new/datum/uplink_random_item(/datum/uplink_item/item/ewar_voice, reselect_propbability = 15)
items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/ewar_voice, reselect_propbability = 15)
items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/maneuvering_jets, reselect_propbability = 15)
items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/egun, reselect_propbability = 15)
items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/power_sink, reselect_propbability = 15)
code/modules/research/designs.dm
+9
View File
@@ -837,6 +837,15 @@ datum/design/item/experimental_welder
build_path = /obj/item/weapon/storage/backpack/holding
sort_string = "VAEAA"
/datum/design/item/bluespace_crystal
name = "Artificial Bluespace Crystal"
desc = "An artificially made bluespace crystal."
id = "bluespace_crystal"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
materials = list("gold" = 1500, "diamond" = 1500, "phoron" = 1500)
build_path = /obj/item/bluespace_crystal/artificial
sort_string = "VAFAA"
/datum/design/item/binaryencrypt
name = "Binary encryption key"
desc = "Allows for deciphering the binary channel on-the-fly."
maps/aurora/aurora-2_under-station.dmm
+1101 -1090
View File
File diff suppressed because it is too large Load Diff
maps/aurora/aurora-3_sublevel.dmm
+19 -3
View File
@@ -4194,6 +4194,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/airlock_sensor/airlock_exterior{
frequency = 1380;
id_tag = "ai_core_sensor_exterior";
master_tag = null;
pixel_x = 35;
pixel_y = 25
},
/turf/simulated/floor/tiled/dark{
name = "cooled dark floor";
temperature = 278
@@ -4229,7 +4236,9 @@
tag_airpump = "ai_core_pump";
tag_chamber_sensor = "ai_core_sensor";
tag_exterior_door = "ai_core_outer";
tag_interior_door = "ai_core_inner"
tag_exterior_sensor = "ai_core_sensor_exterior";
tag_interior_door = "ai_core_inner";
tag_interior_sensor = "ai_core_sensor_interior"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
@@ -4316,6 +4325,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/airlock_sensor/airlock_interior{
frequency = 1380;
id_tag = "ai_core_sensor_interior";
master_tag = null;
pixel_x = -35;
pixel_y = -25
},
/turf/simulated/floor/tiled/dark{
name = "cooled dark floor";
temperature = 278
@@ -16000,7 +16016,7 @@
/area/medical/virology)
"Bn" = (
/obj/machinery/camera/network/medbay{
c_tag = "Virology Starboard";
c_tag = "Medical - Virology Starboard";
dir = 8
},
/obj/machinery/door/firedoor,
@@ -40573,7 +40589,7 @@ aa
aa
ab
ab
bP
gH
ab
ab
ab
maps/aurora/aurora-4_mainlevel.dmm
+7 -6
View File
@@ -6241,11 +6241,6 @@
req_access = null;
req_one_access = list(11,24)
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -6253,6 +6248,12 @@
dir = 4
},
/obj/machinery/door/firedoor,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/turf/simulated/floor/plating,
/area/maintenance/atmos_control)
"amP" = (
@@ -62751,7 +62752,6 @@
/turf/simulated/floor/tiled/white,
/area/rnd/telesci)
"cfV" = (
/obj/structure/table/reinforced,
/obj/machinery/button/remote/blast_door{
id = "telescience";
name = "Containment Blast Doors";
@@ -62769,6 +62769,7 @@
name = "Station Intercom (General)";
pixel_x = -27
},
/obj/structure/table/standard,
/turf/simulated/floor/tiled/white,
/area/rnd/telesci)
"cfW" = (