mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 21:40:55 +01:00
Use rustg 1.2.0+a2 (from our other repo), update our pipeline, fix what's needed to not make it fail (#16051)
* Let's see how this goes, updated the versions of various dependencies * Changelog * Didn't we merge a fix for those already? Anyways... * Almost... * Switch flyway to 9.9.0 instead * Forgot one place where this is doubly defined * Package dependency attempt fix * Try to run on latest ubuntu version * Forgot one * Try to force cffi consistency * Other way around * aurora was a mistake * Like this more? * Stupid pipeline * F * FF * Bruh ZAS * GDI * FFS ZAS + UT * Checked maps, temp is set as this in there, so updating ZAS UT, wich was probably conked before * All AI rooms are in normal expectation, so updating ZAS UT for it * First attempt at making the AI area in the Horizon cooled * F * And the old aurora * Remove version binding on requirements * Updated changelog * Spelling * Binds versions again, as majority voted
This commit is contained in:
@@ -18,11 +18,12 @@ env:
|
||||
jobs:
|
||||
lint:
|
||||
if: "!contains(github.event.head_commit.message, '[ci skip]')"
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Install
|
||||
run: |
|
||||
sudo apt-get install python3-cffi
|
||||
pip install --user -r ./tools/requirements.txt
|
||||
chmod +x ./scripts/code_check.sh && ./scripts/code_check.sh $PWD
|
||||
bash tools/ci/install_spaceman_dmm.sh dreamchecker
|
||||
@@ -48,7 +49,7 @@ jobs:
|
||||
matrix:
|
||||
map: [runtime, aurora, sccv_horizon, away_sites_testing]
|
||||
fail-fast: false
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-22.04
|
||||
needs: lint
|
||||
services:
|
||||
mariadb:
|
||||
@@ -67,7 +68,7 @@ jobs:
|
||||
source .versions.sh
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y gcc-multilib libssl1.1:i386
|
||||
sudo apt-get install -y gcc-multilib zlib1g-dev:i386 libssl-dev:i386
|
||||
bash tools/ci/install_byond.sh
|
||||
source $HOME/BYOND/byond/bin/byondsetup
|
||||
echo "Getting rust_g from https://github.com/Aurorastation/rust-g/releases/download/${RUST_G_VERSION}/librust_g.so"
|
||||
|
||||
+6
-6
@@ -1,19 +1,19 @@
|
||||
language: generic
|
||||
dist: xenial
|
||||
dist: jammy
|
||||
sudo: false
|
||||
|
||||
env:
|
||||
global:
|
||||
BYOND_MAJOR="513"
|
||||
BYOND_MINOR="1517"
|
||||
BYOND_MAJOR="514"
|
||||
BYOND_MINOR="1589"
|
||||
MACRO_COUNT=0
|
||||
GENDER_COUNT=6
|
||||
TO_WORLD_COUNT=209
|
||||
FLYWAY_BUILD="5.2.4"
|
||||
FLYWAY_BUILD="9.9.0"
|
||||
NODE_VERSION=10
|
||||
RUST_G_VERSION="0.4.2+a2"
|
||||
RUST_G_VERSION="v1.2.0+a2"
|
||||
PATH=/opt/python/3.7.1/bin:$PATH
|
||||
SPACEMAN_DMM_VERSION="suite-1.6"
|
||||
SPACEMAN_DMM_VERSION="suite-1.7.3"
|
||||
matrix:
|
||||
- USE_MAP=aurora
|
||||
- USE_MAP=runtime
|
||||
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
#!/bin/sh
|
||||
|
||||
export BYOND_MAJOR=514
|
||||
export BYOND_MINOR=1560
|
||||
export BYOND_MINOR=1589
|
||||
|
||||
export RUST_G_VERSION=v0.5.0+a2
|
||||
export FLYWAY_BUILD=5.2.4
|
||||
export SPACEMAN_DMM_VERSION=suite-1.7
|
||||
export RUST_G_VERSION=v1.2.0+a2
|
||||
export FLYWAY_BUILD=9.9.0
|
||||
export SPACEMAN_DMM_VERSION=suite-1.7.3
|
||||
|
||||
@@ -269,9 +269,9 @@ proc/tg_list2text(list/list, glue=",")
|
||||
switch(child)
|
||||
if(/datum)
|
||||
return null
|
||||
if(/obj || /mob)
|
||||
if(/obj, /mob)
|
||||
return /atom/movable
|
||||
if(/area || /turf)
|
||||
if(/area, /turf)
|
||||
return /atom
|
||||
else
|
||||
return /datum
|
||||
|
||||
@@ -623,7 +623,7 @@
|
||||
suit.name = "captain voidsuit"
|
||||
suit.icon_state = "capspace"
|
||||
suit.item_state = "capspace"
|
||||
if("^%###^%$" || "Mercenary")
|
||||
if("^%###^%$", "Mercenary")
|
||||
if(helmet)
|
||||
helmet.name = "blood-red voidsuit helmet"
|
||||
helmet.icon_state = "rig0-syndie"
|
||||
|
||||
@@ -67,6 +67,10 @@
|
||||
icon_state = "bcircuit"
|
||||
initial_flooring = /singleton/flooring/reinforced/circuit
|
||||
|
||||
/turf/simulated/floor/bluegrid/cooled
|
||||
name = "cooled mainframe floor"
|
||||
temperature = 278
|
||||
|
||||
/turf/simulated/floor/greengrid
|
||||
name = "mainframe floor"
|
||||
icon = 'icons/turf/flooring/circuit.dmi'
|
||||
@@ -130,6 +134,10 @@
|
||||
icon_state = "steel"
|
||||
initial_flooring = /singleton/flooring/tiling
|
||||
|
||||
/turf/simulated/floor/tiled/cooled
|
||||
name = "cooled steel tiles"
|
||||
temperature = 278
|
||||
|
||||
/turf/simulated/floor/tiled/full
|
||||
name = "full steel tile"
|
||||
icon_state = "steel_full"
|
||||
@@ -147,6 +155,10 @@
|
||||
initial_flooring = /singleton/flooring/reinforced
|
||||
footstep_sound = /singleton/sound_category/plating_footstep
|
||||
|
||||
/turf/simulated/floor/reinforced/cooled
|
||||
name = "cooled reinforced floor"
|
||||
temperature = 278
|
||||
|
||||
/turf/simulated/floor/reinforced/airless
|
||||
oxygen = 0
|
||||
nitrogen = 0
|
||||
@@ -214,6 +226,10 @@
|
||||
icon_state = "dark"
|
||||
initial_flooring = /singleton/flooring/tiling/dark
|
||||
|
||||
/turf/simulated/floor/tiled/dark/cooled
|
||||
name = "cooled plasteel tiles"
|
||||
temperature = 278
|
||||
|
||||
/turf/simulated/floor/tiled/dark/airless
|
||||
oxygen = 0
|
||||
nitrogen = 0
|
||||
@@ -273,6 +289,10 @@
|
||||
nitrogen = 0
|
||||
roof_type = null
|
||||
|
||||
/turf/simulated/floor/plating/cooled
|
||||
name = "cooled plating"
|
||||
temperature = 278
|
||||
|
||||
/turf/simulated/floor/plating/asteroid
|
||||
icon = 'icons/turf/total_floors.dmi'
|
||||
icon_state = "asteroidplating"
|
||||
|
||||
@@ -39,9 +39,9 @@
|
||||
|
||||
/obj/machinery/atmospherics/valve/Initialize()
|
||||
switch(dir)
|
||||
if(NORTH || SOUTH)
|
||||
if(NORTH, SOUTH)
|
||||
initialize_directions = NORTH|SOUTH
|
||||
if(EAST || WEST)
|
||||
if(EAST, WEST)
|
||||
initialize_directions = EAST|WEST
|
||||
. = ..()
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ proc/Intoxicated(phrase)
|
||||
if(lowertext(newletter)=="a") newletter="ah"
|
||||
if(lowertext(newletter)=="c") newletter="k"
|
||||
switch(rand(1,7))
|
||||
if(1,3,5,8) newletter="[lowertext(newletter)]"
|
||||
if(2,4,6,15) newletter="[uppertext(newletter)]"
|
||||
if(1,3,5) newletter="[lowertext(newletter)]"
|
||||
if(2,4,6) newletter="[uppertext(newletter)]"
|
||||
if(7) newletter+="'"
|
||||
//if(9,10) newletter="<b>[newletter]</b>"
|
||||
//if(11,12) newletter="<big>[newletter]</big>"
|
||||
|
||||
@@ -147,6 +147,8 @@
|
||||
holder.make_dizzy(105)
|
||||
if(3)
|
||||
to_chat(holder, SPAN_GOOD("You feel good."))
|
||||
else
|
||||
. = null //This does nothing, it's to avoid a dreamchecker error
|
||||
..()
|
||||
|
||||
//the prick feeling but you actually imagine someone injecting you
|
||||
|
||||
@@ -112,6 +112,8 @@ proc/get_radio_key_from_channel(var/channel)
|
||||
Weaken(3)
|
||||
if(11 to 60)
|
||||
to_chat(src, SPAN_WARNING("You struggle to speak with your dislocated jaw!"))
|
||||
else
|
||||
. = null //This does nothing, it's to avoid a dreamchecker error
|
||||
. = TRUE
|
||||
else if(stuttering)
|
||||
message = get_stuttered_message(message)
|
||||
|
||||
@@ -384,9 +384,14 @@ proc/slur(phrase, strength = 100)
|
||||
if(lowertext(newletter)=="a") newletter="ah"
|
||||
if(lowertext(newletter)=="c") newletter="k"
|
||||
switch(rand(1,15))
|
||||
if(1,3,5,8) newletter="[lowertext(newletter)]"
|
||||
if(2,4,6,15) newletter="[uppertext(newletter)]"
|
||||
if(7) newletter+="'"
|
||||
if(1,3,5,8)
|
||||
newletter="[lowertext(newletter)]"
|
||||
if(2,4,6,15)
|
||||
newletter="[uppertext(newletter)]"
|
||||
if(7)
|
||||
newletter+="'"
|
||||
else
|
||||
. = null // For dreamchecker, does nothing
|
||||
newphrase+="[newletter]";counter-=1
|
||||
return newphrase
|
||||
|
||||
|
||||
@@ -371,10 +371,10 @@
|
||||
var/dir2 = 0
|
||||
var/dir3 = 0
|
||||
switch(direction)
|
||||
if(NORTH||SOUTH)
|
||||
if(NORTH, SOUTH)
|
||||
dir2 = 4
|
||||
dir3 = 8
|
||||
if(EAST||WEST)
|
||||
if(EAST, WEST)
|
||||
dir2 = 1
|
||||
dir3 = 2
|
||||
var/turf/T2 = T
|
||||
|
||||
@@ -64,33 +64,32 @@ proc/test_air_in_area(var/test_area, var/expectation = UT_NORMAL)
|
||||
var/pressure = GM.return_pressure()
|
||||
var/temp = GM.temperature
|
||||
|
||||
switch(expectation)
|
||||
|
||||
if(UT_VACUUM)
|
||||
if(pressure > 10)
|
||||
test_result["msg"] = "Pressure out of bounds: [pressure] | [t_msg]"
|
||||
if(expectation == UT_VACUUM)
|
||||
if(pressure > 10)
|
||||
test_result["msg"] = "Pressure out of bounds: [pressure]Pa at [temp]K | [t_msg] | expectation: VACUUM"
|
||||
return test_result
|
||||
|
||||
|
||||
if(expectation == UT_NORMAL || expectation == UT_NORMAL_COLD || expectation == UT_NORMAL_COOL)
|
||||
if(abs(pressure - ONE_ATMOSPHERE) > 10)
|
||||
test_result["msg"] = "Pressure out of bounds: [pressure]Pa | [t_msg]"
|
||||
return test_result
|
||||
|
||||
if(expectation == UT_NORMAL)
|
||||
if(abs(temp - T20C) > 10)
|
||||
test_result["msg"] = "Temperature out of bounds: [temp]K at [pressure]Pa | [t_msg] | expectation: NORMAL"
|
||||
return test_result
|
||||
|
||||
|
||||
if(UT_NORMAL || UT_NORMAL_COLD || UT_NORMAL_COOL)
|
||||
if(abs(pressure - ONE_ATMOSPHERE) > 10)
|
||||
test_result["msg"] = "Pressure out of bounds: [pressure] | [t_msg]"
|
||||
if(expectation == UT_NORMAL_COLD)
|
||||
if(temp > 120)
|
||||
test_result["msg"] = "Temperature out of bounds: [temp]K at [pressure]Pa | [t_msg] | expectation: NORMAL_COLD"
|
||||
return test_result
|
||||
|
||||
if(expectation == UT_NORMAL)
|
||||
if(abs(temp - T20C) > 10)
|
||||
test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
|
||||
return test_result
|
||||
|
||||
if(expectation == UT_NORMAL_COLD)
|
||||
if(temp > 120)
|
||||
test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
|
||||
return test_result
|
||||
|
||||
if(expectation == UT_NORMAL_COOL)
|
||||
if(temp > 283)
|
||||
test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
|
||||
return test_result
|
||||
if(expectation == UT_NORMAL_COOL)
|
||||
if(temp > 283)
|
||||
test_result["msg"] = "Temperature out of bounds: [temp]K at [pressure]Pa | [t_msg] | expectation: NORMAL_COOL"
|
||||
return test_result
|
||||
|
||||
GM_checked.Add(GM)
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
################################
|
||||
# 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: Fluffyghost
|
||||
|
||||
# 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: "Updated build chain to use the new rustg v1.2.0+a2 from our repository, after having updated our repository."
|
||||
- backend: "Updated byond version to use to 514.1589 from the previously set minor, in the chain."
|
||||
- backend: "Updated flyway version to use to 9.9.0."
|
||||
- backend: "Updated spacemandmm version to use to 1.7.3."
|
||||
- backend: "Removed version bindings for pip requirements."
|
||||
- backend: "Github pipeline now runs on Ubuntu 22.04 (from 20.04), both are LTS."
|
||||
- backend: "Added package requirements to correctly bind into the new version of rust-g."
|
||||
- rscadd: "Added some premade cooled floors, used in the AI chamber."
|
||||
- maptweak: "AI Chamber in Aurora and Horizon now uses the cooled floors."
|
||||
- bugfix: "Fixed ZAS unit tests (along with the mapping above) so now they correctly run. They were not since Aurora."
|
||||
- bugfix: "Fixed switch statements that were using double pipes, as they are either not supported since a while or never were."
|
||||
- bugfix: "Fixed switch statements based on random() that did not catch the variables, as the codechecks now catch them."
|
||||
- rscadd: "ZAS Unit Tests now tell when something fails the temperature, pressure and what expectation parameter they checked for."
|
||||
+103
-379
File diff suppressed because it is too large
Load Diff
@@ -724,7 +724,7 @@
|
||||
name = "Inner Core Airlock";
|
||||
req_access = list(13)
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"aFN" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
@@ -2026,7 +2026,7 @@
|
||||
req_access = list(13)
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden,
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"bBR" = (
|
||||
/obj/machinery/computer/general_air_control/large_tank_control{
|
||||
@@ -3740,7 +3740,7 @@
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/machinery/porta_turret,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"cTm" = (
|
||||
/obj/machinery/portable_atmospherics/canister/air/airlock,
|
||||
@@ -6201,7 +6201,7 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"eOk" = (
|
||||
/obj/structure/cable{
|
||||
@@ -7823,7 +7823,7 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"fVm" = (
|
||||
/obj/structure/closet/hazmat/custodial,
|
||||
@@ -8437,7 +8437,7 @@
|
||||
/area/hallway/engineering)
|
||||
"gsG" = (
|
||||
/obj/structure/lattice/catwalk/indoor/grate,
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"gtE" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -12318,7 +12318,7 @@
|
||||
/obj/structure/railing/mapped,
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/machinery/porta_turret,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"jyn" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
@@ -12443,7 +12443,7 @@
|
||||
pixel_y = -25
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"jCf" = (
|
||||
/obj/machinery/light/small/emergency,
|
||||
@@ -15267,7 +15267,7 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"lPP" = (
|
||||
/obj/structure/tank_wall/hydrogen{
|
||||
@@ -16700,7 +16700,7 @@
|
||||
c_tag = "AI Core - First Deck Chamber";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"mVJ" = (
|
||||
/obj/structure/cable/green{
|
||||
@@ -17231,7 +17231,7 @@
|
||||
/obj/structure/railing/mapped,
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/machinery/porta_turret,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"nqp" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
@@ -21543,7 +21543,7 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"qQa" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
@@ -23306,7 +23306,7 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"skS" = (
|
||||
/obj/machinery/light/spot/weak,
|
||||
@@ -23660,7 +23660,7 @@
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/machinery/porta_turret,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"sxx" = (
|
||||
/obj/machinery/recharge_station,
|
||||
@@ -24176,7 +24176,7 @@
|
||||
id_tag = "ai_core_sensor";
|
||||
pixel_x = -30
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"sTu" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
@@ -26767,7 +26767,7 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"uRt" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
@@ -30175,7 +30175,7 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"xrp" = (
|
||||
/obj/effect/floor_decal/corner/blue{
|
||||
@@ -30650,7 +30650,7 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"xLq" = (
|
||||
/obj/structure/table/rack{
|
||||
|
||||
@@ -2040,7 +2040,7 @@
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/spline/fancy,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"aTa" = (
|
||||
/obj/machinery/light,
|
||||
@@ -2784,7 +2784,7 @@
|
||||
"bkQ" = (
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/machinery/porta_turret,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/floor/reinforced/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"blJ" = (
|
||||
/obj/machinery/door/airlock/external{
|
||||
@@ -3074,7 +3074,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/spline/fancy/corner,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"bqW" = (
|
||||
/obj/effect/floor_decal/corner_wide/yellow/full{
|
||||
@@ -6044,7 +6044,7 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"cRu" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
@@ -6375,7 +6375,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"dat" = (
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
@@ -9257,7 +9257,7 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"eAl" = (
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
@@ -16105,7 +16105,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"hEx" = (
|
||||
/obj/machinery/light{
|
||||
@@ -16574,7 +16574,7 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"hSp" = (
|
||||
/obj/structure/closet/crate/hydroponics,
|
||||
@@ -17411,7 +17411,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/porta_turret,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/floor/reinforced/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"imC" = (
|
||||
/obj/structure/railing/mapped{
|
||||
@@ -19878,7 +19878,7 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"jvp" = (
|
||||
/obj/structure/closet/secure_closet/guncabinet{
|
||||
@@ -21655,7 +21655,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/firealarm/west,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"krl" = (
|
||||
/obj/machinery/door/airlock/mining{
|
||||
@@ -24827,7 +24827,7 @@
|
||||
c_tag = "AI Core - Fore"
|
||||
},
|
||||
/obj/structure/window/borosilicate/reinforced/skrell,
|
||||
/turf/simulated/floor/bluegrid,
|
||||
/turf/simulated/floor/bluegrid/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"lYV" = (
|
||||
/obj/structure/table/stone/marble,
|
||||
@@ -26322,7 +26322,7 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"mHM" = (
|
||||
/obj/machinery/door/airlock/highsecurity{
|
||||
@@ -28021,7 +28021,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"ntt" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
@@ -29739,7 +29739,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"oou" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
@@ -31268,7 +31268,7 @@
|
||||
"pch" = (
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/machinery/anti_bluespace,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/floor/reinforced/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"pcx" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
@@ -33684,7 +33684,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy/corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"qni" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
@@ -34013,7 +34013,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/porta_turret,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/floor/reinforced/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"qvx" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
|
||||
@@ -34094,7 +34094,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"qwJ" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
@@ -35475,7 +35475,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy/corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"rfO" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
@@ -37930,7 +37930,7 @@
|
||||
pixel_x = -40;
|
||||
pixel_y = 25
|
||||
},
|
||||
/turf/simulated/floor/bluegrid,
|
||||
/turf/simulated/floor/bluegrid/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"sqc" = (
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
@@ -39104,7 +39104,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy/corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"sYI" = (
|
||||
/obj/machinery/alarm{
|
||||
@@ -41975,7 +41975,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"upn" = (
|
||||
/obj/structure/cable/green{
|
||||
@@ -47683,7 +47683,7 @@
|
||||
/obj/effect/floor_decal/spline/fancy{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/turf/simulated/floor/tiled/dark/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"wWx" = (
|
||||
/turf/simulated/floor/wood,
|
||||
@@ -48850,7 +48850,7 @@
|
||||
dir = 1;
|
||||
pixel_y = 24
|
||||
},
|
||||
/turf/simulated/floor/bluegrid,
|
||||
/turf/simulated/floor/bluegrid/cooled,
|
||||
/area/turret_protected/ai)
|
||||
"xxy" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
pygit2==1.4.0
|
||||
bidict==0.21.2
|
||||
Pillow==9.3.0
|
||||
pygit2==1.11.1
|
||||
bidict==0.22.1
|
||||
Pillow==9.4.0
|
||||
PyYAML==5.4.1
|
||||
beautifulsoup4==4.10.0
|
||||
beautifulsoup4==4.11.2
|
||||
|
||||
Reference in New Issue
Block a user