cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes *some* CI issues (#11461)

Browse Source
This commit is contained in:
MarinaGryphon
2021-03-17 22:34:25 +01:00
committed by GitHub
parent 4cb630c01e
commit 02e2babdb3
6 changed files with 115 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+2 -2
View File
@@ -60,8 +60,8 @@
var/turf/T = get_turf(src)
if(!istype(T))
return
add_underlay(T, node1, turn(dir, 180), node1.icon_connect_type)
add_underlay(T, node2, dir, node2.icon_connect_type)
add_underlay(T, node1, turn(dir, 180), node1?.icon_connect_type)
add_underlay(T, node2, dir, node2?.icon_connect_type)
/obj/machinery/atmospherics/binary/passive_gate/hide(var/i)
update_underlays()
code/unit_tests/recipe_tests.dm
+3 -4
View File
@@ -9,8 +9,7 @@
/datum/unit_test/research_design_cost/start_test()
var/tested_count = 0
var/error_count = 0
for(var/T in subtypesof(/datum/design))
var/datum/design/D = new T
for(var/datum/design/D in designs)
if(ispath(D.build_path, /obj/item))
var/obj/item/I = D.Fabricate()
if(I.matter && D.materials && I.recyclable) // non-recyclable items can't be exploited
@@ -40,8 +39,8 @@
/datum/unit_test/stack_recipe_cost/start_test()
var/tested_count = 0
var/error_count = 0
for(var/T in subtypesof(/material))
var/material/D = new T
SSmaterials.create_material_lists() // just in case
for(var/material/D in SSmaterials.materials)
var/list/datum/stack_recipe_list/recipe_lists = D.get_recipes()
var/list/temp_matter = D.get_matter()
for(var/datum/stack_recipe_list/L in recipe_lists)
html/changelogs/mdp-ci-tweaks.yml
+43
View File
@@ -0,0 +1,43 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: MoondancerPony
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- backend: "CI recipe tests no longer reinstantiate singletons."
- maptweak: "Exodus loads properly again."
- bugfix: "Fixes a runtime with atmos components."
maps/exodus/exodus-1_station.dmm
+61 -71
View File
@@ -5719,9 +5719,6 @@
"akG" = (
/turf/simulated/wall,
/area/security/forensics_office)
"akH" = (
/turf/simulated/wall,
/area/security/detectives_office)
"akI" = (
/obj/machinery/light_switch{
name = "light switch ";
@@ -6507,7 +6504,7 @@
id = "Detective"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
/area/security/forensics_office)
"alW" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
@@ -6523,7 +6520,7 @@
id = "Detective"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
/area/security/forensics_office)
"alX" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
@@ -6543,7 +6540,7 @@
id = "Detective"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
/area/security/forensics_office)
"alZ" = (
/obj/effect/floor_decal/corner/blue{
dir = 9
@@ -6558,7 +6555,7 @@
/area/security/forensics_office)
"ama" = (
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"amb" = (
/obj/structure/cable/green{
d1 = 1;
@@ -6850,19 +6847,19 @@
"amG" = (
/obj/item/modular_computer/console/preset/security/investigations,
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"amI" = (
/obj/structure/bed/chair/comfy/beige,
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"amJ" = (
/obj/structure/table/wood,
/obj/item/device/flashlight/lamp/green,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"amL" = (
/obj/machinery/photocopier,
/obj/effect/floor_decal/corner/blue{
@@ -7187,29 +7184,29 @@
id = "Detective"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
/area/security/forensics_office)
"anp" = (
/obj/item/stool/padded,
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"anq" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"anr" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"ans" = (
/obj/structure/table/wood,
/obj/item/folder/sec,
/obj/item/pen,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"anu" = (
/obj/effect/floor_decal/corner/blue/full,
/obj/machinery/disposal,
/obj/structure/closet/secure_closet/csi,
/obj/structure/closet/secure_closet/investigator,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/security/forensics_office)
@@ -7607,7 +7604,7 @@
dir = 4
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"anX" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -7615,20 +7612,20 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"anY" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
/obj/item/device/taperecorder,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"anZ" = (
/obj/machinery/camera/network/security{
c_tag = "Security - Detective's Office";
dir = 8
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"aob" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
@@ -8126,7 +8123,7 @@
pixel_x = -22
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"aoS" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -8134,13 +8131,13 @@
dir = 6
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"aoT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"aoV" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/structure/table/glass,
@@ -8507,7 +8504,7 @@
id = "Detective"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
/area/security/forensics_office)
"apF" = (
/obj/machinery/photocopier,
/obj/machinery/light{
@@ -8516,7 +8513,7 @@
},
/obj/structure/window/reinforced,
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"apH" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/turf/simulated/floor/tiled/white,
@@ -8932,7 +8929,7 @@
req_access = list(68)
},
/turf/simulated/floor/wood,
/area/security/detectives_office)
/area/security/forensics_office)
"aqq" = (
/obj/structure/cable/green{
d1 = 4;
@@ -8949,7 +8946,7 @@
dir = 4
},
/turf/simulated/floor/wood,
/area/security/detectives_office)
/area/security/forensics_office)
"aqr" = (
/obj/structure/window/reinforced{
dir = 4
@@ -8970,13 +8967,13 @@
dir = 9
},
/turf/simulated/floor/wood,
/area/security/detectives_office)
/area/security/forensics_office)
"aqs" = (
/turf/simulated/floor/tiled/ramp/bottom{
dir = 1;
tag = "icon-rampbot (NORTH)"
},
/area/security/detectives_office)
/area/security/forensics_office)
"aqt" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -8990,7 +8987,7 @@
pictures_left = 30
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"aqv" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/structure/table/glass,
@@ -9317,14 +9314,14 @@
id = "Detective"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
/area/security/forensics_office)
"arb" = (
/obj/machinery/light_switch{
pixel_y = -24
},
/obj/structure/coatrack,
/turf/simulated/floor/wood,
/area/security/detectives_office)
/area/security/forensics_office)
"arc" = (
/obj/machinery/firealarm/south,
/obj/structure/cable/green{
@@ -9333,7 +9330,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/wood,
/area/security/detectives_office)
/area/security/forensics_office)
"ard" = (
/obj/structure/cable/green{
d1 = 4;
@@ -9341,7 +9338,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/wood,
/area/security/detectives_office)
/area/security/forensics_office)
"arf" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/structure/table/glass,
@@ -74405,7 +74402,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/window/reinforced,
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"dDo" = (
/obj/machinery/mass_driver{
dir = 4;
@@ -74537,7 +74534,7 @@
dir = 4
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"eGm" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
@@ -75120,7 +75117,7 @@
icon_state = "tube1"
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"kSF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -75186,7 +75183,7 @@
/area/medical/psych)
"man" = (
/turf/simulated/floor/wood,
/area/security/detectives_office)
/area/security/forensics_office)
"maN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -75458,13 +75455,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/secondary/exit)
"oeU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
req_one_access = list(4,68)
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
"onz" = (
/obj/effect/floor_decal/corner/white{
dir = 4
@@ -75738,7 +75728,7 @@
id = "Detective"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
/area/security/forensics_office)
"qDO" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/ringer{
@@ -76138,7 +76128,7 @@
"sxU" = (
/obj/machinery/computer/security,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
/area/security/forensics_office)
"szr" = (
/obj/structure/table/standard,
/obj/item/device/camera,
@@ -76378,7 +76368,7 @@
id = "Detective"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
/area/security/forensics_office)
"uev" = (
/obj/machinery/optable{
name = "Autopsy Table"
@@ -76465,7 +76455,7 @@
pixel_x = 32
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"uDW" = (
/obj/structure/bed/chair/office/light,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -76531,7 +76521,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/wood,
/area/security/detectives_office)
/area/security/forensics_office)
"uTU" = (
/obj/machinery/door/airlock/external{
frequency = 1380;
@@ -76893,10 +76883,10 @@
/area/rnd/test_area)
"xSj" = (
/obj/structure/window/reinforced,
/obj/structure/closet/secure_closet/detective,
/obj/structure/closet/secure_closet/investigator,
/obj/item/book/manual/wiki/security_space_law,
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
"xUB" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -76906,7 +76896,7 @@
/area/security/forensics_office)
"xXA" = (
/turf/simulated/floor/lino,
/area/security/detectives_office)
/area/security/forensics_office)
(1,1,1) = {"
aaa
@@ -106292,11 +106282,11 @@ ajm
ajR
akv
ali
akH
akG
ubu
ano
qrg
akH
akG
apE
aqp
ara
@@ -106557,7 +106547,7 @@ aoR
apF
aqq
arb
akH
akG
apc
atb
atK
@@ -106814,7 +106804,7 @@ aoS
duM
aqr
arc
akH
akG
apc
rio
ath
@@ -107063,7 +107053,7 @@ ajp
agY
aky
ale
akH
akG
amI
ama
anr
@@ -107071,7 +107061,7 @@ etT
xXA
aqs
ard
akH
akG
apR
atc
ath
@@ -107328,7 +107318,7 @@ aoT
xXA
aqt
uTs
akH
akG
apR
atd
ath
@@ -107577,7 +107567,7 @@ ajr
agG
sps
alm
akH
akG
sxU
kOs
anZ
@@ -107585,7 +107575,7 @@ xXA
uCO
xSj
man
oeU
xUB
apR
atd
ath
@@ -107834,15 +107824,15 @@ ajs
agy
akA
aln
akH
akH
akH
akH
akH
akH
akH
akH
akH
akG
akG
akG
akG
akG
akG
akG
akG
akG
asp
atd
atL
maps/exodus/exodus-2_centcomm.dmm
+4 -4
View File
@@ -14459,10 +14459,10 @@
/area/centcom/control)
"aVR" = (
/obj/structure/table/reinforced,
/obj/item/mecha_equipment/mounted_system/taser/ion,
/obj/item/mecha_equipment/mounted_system/taser,
/obj/item/mecha_equipment/mounted_system/taser/laser,
/obj/item/mecha_equipment/mounted_system/taser/smg,
/obj/item/mecha_equipment/mounted_system/combat/ion,
/obj/item/mecha_equipment/mounted_system/combat/taser,
/obj/item/mecha_equipment/mounted_system/combat/laser,
/obj/item/mecha_equipment/mounted_system/combat/smg,
/turf/unsimulated/floor{
dir = 1;
icon_state = "vault"
scripts/dm.sh
+2
View File
@@ -56,4 +56,6 @@ fi
rm $dmepath.mdme
chmod -R a+rwX .
exit $retval