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

Merge branch 'master' into prepare_stuff_for_second_week

Browse Source
This commit is contained in:
alberyk
2022-01-29 11:45:45 -03:00
parent 8e875dc192 edb1c08178
commit cd07daa559
35 changed files with 208 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/species.dm
+7 -1
View File
@@ -95,4 +95,10 @@
#define BODYTYPE_MONKEY "Monkey"
#define BODYTYPE_SKELETON "Skeleton"
#define BODYTYPE_CULTGHOST "Apparition"
#define BODYTYPE_CULTGHOST "Apparition"
#define ALL_SPECIES list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, \
SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_UNBRANDED, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, \
SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, \
SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_VAURCA_WORKER, \
SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
code/controllers/configuration.dm
+3
View File
@@ -294,6 +294,7 @@ var/list/gamemode_cache = list()
// Configurable hostname / port for the NTSL Daemon.
var/ntsl_hostname = "localhost"
var/ntsl_port = "1945"
var/ntsl_disabled = TRUE
// Is external Auth enabled
var/external_auth = FALSE
@@ -938,6 +939,8 @@ var/list/gamemode_cache = list()
ntsl_hostname = value
if ("ntsl_port")
ntsl_port = value
if ("ntsl_disabled")
ntsl_disabled = text2num(value)
if ("external_auth")
external_auth = TRUE
code/controllers/subsystems/documents.dm
+4 -3
View File
@@ -137,10 +137,11 @@ var/datum/controller/subsystem/docs/SSdocs
//Loads the document data from JSON
/datum/controller/subsystem/docs/proc/load_from_json()
var/list/docsconfig = list()
try
if(isfile("config/docs.json"))
docsconfig = json_decode(return_file_text("config/docs.json"))
catch(var/exception/ej)
log_debug("SSdocs: Warning: Could not load config, as docs.json is missing - [ej]")
else
log_debug("SSdocs: Warning: Could not load config, as docs.json is missing")
return 0
//Reset the currently loaded data
code/controllers/subsystems/processing/ntsl2.dm
+7 -4
View File
@@ -34,7 +34,7 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
if(RUSTG_HTTP_METHOD_POST)
if(arguments)
body = json_encode(arguments)
return http_create_request(method, url, body)
return FALSE
@@ -107,7 +107,7 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
if(istype(cb))
cb.InvokeAsync(response)
/datum/controller/subsystem/processing/ntsl2/proc/is_complete(var/task_id)
if(!task_id)
@@ -115,9 +115,12 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
if(tasks[task_id])
return FALSE
return TRUE
/datum/controller/subsystem/processing/ntsl2/proc/attempt_connect()
if(config.ntsl_disabled)
log_debug("NTSL2++ Daemon disabled via config")
return FALSE
var/res = sync_send("clear")
if(!res)
log_debug("NTSL2++ Daemon could not be connected to. Functionality will not be enabled.")
@@ -150,4 +153,4 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
handle_task_completion(result, task)
tasks -= task_id
. = ..()
. = ..()
code/game/turfs/simulated/wall_types.dm
+19 -1
View File
@@ -12,10 +12,12 @@
/turf/simulated/wall/cult/Initialize(mapload)
. = ..(mapload, MATERIAL_CULT)
desc = "Hideous images dance beneath the surface."
canSmoothWith = list(/turf/simulated/wall/cult, /turf/simulated/wall/cult_reinforced)
/turf/simulated/wall/cult_reinforced/Initialize(mapload)
. = ..(mapload, MATERIAL_CULT, MATERIAL_CULT_REINFORCED)
desc = "Hideous images dance beneath the surface."
canSmoothWith = list(/turf/simulated/wall/cult, /turf/simulated/wall/cult_reinforced)
/turf/unsimulated/wall/cult
name = "cult wall"
@@ -29,49 +31,65 @@
/turf/simulated/wall/vaurca/Initialize(mapload)
. = ..(mapload, MATERIAL_VAURCA)
canSmoothWith = list(src.type)
/turf/simulated/wall/iron/Initialize(mapload)
. = ..(mapload, MATERIAL_IRON)
canSmoothWith = list(src.type)
/turf/simulated/wall/uranium/Initialize(mapload)
. = ..(mapload, MATERIAL_URANIUM)
canSmoothWith = list(src.type)
/turf/simulated/wall/diamond/Initialize(mapload)
. = ..(mapload, MATERIAL_DIAMOND)
canSmoothWith = list(src.type)
/turf/simulated/wall/gold/Initialize(mapload)
. = ..(mapload, MATERIAL_GOLD)
canSmoothWith = list(src.type)
/turf/simulated/wall/silver/Initialize(mapload)
. = ..(mapload, MATERIAL_SILVER)
canSmoothWith = list(src.type)
/turf/simulated/wall/phoron/Initialize(mapload)
. = ..(mapload, MATERIAL_PHORON)
canSmoothWith = list(src.type)
/turf/simulated/wall/sandstone/Initialize(mapload)
. = ..(mapload, MATERIAL_SANDSTONE)
canSmoothWith = list(src.type)
/turf/simulated/wall/ironphoron/Initialize(mapload)
. = ..(mapload, MATERIAL_IRON, MATERIAL_PHORON)
canSmoothWith = list(src.type)
/turf/simulated/wall/golddiamond/Initialize(mapload)
. = ..(mapload, MATERIAL_GOLD, MATERIAL_DIAMOND)
canSmoothWith = list(src.type)
/turf/simulated/wall/silvergold/Initialize(mapload)
. = ..(mapload, MATERIAL_SILVER, MATERIAL_GOLD)
canSmoothWith = list(src.type)
/turf/simulated/wall/sandstonediamond/Initialize(mapload)
. = ..(mapload, MATERIAL_SANDSTONE, MATERIAL_DIAMOND)
canSmoothWith = list(src.type)
/turf/simulated/wall/titanium/Initialize(mapload)
. = ..(mapload, MATERIAL_TITANIUM)
canSmoothWith = list(src.type)
/turf/simulated/wall/titanium_reinforced/Initialize(mapload)
. = ..(mapload, MATERIAL_TITANIUM, MATERIAL_TITANIUM)
canSmoothWith = list(src.type)
/turf/simulated/wall/wood/Initialize(mapload)
. = ..(mapload, MATERIAL_WOOD)
canSmoothWith = list(src.type)
/turf/simulated/wall/rusty/Initialize(mapload)
. = ..(mapload, MATERIAL_RUST)
desc = "Rust stains this ancient wall."
desc = "Rust stains this ancient wall."
canSmoothWith = list(src.type)
code/game/turfs/simulated/walls.dm
+1 -6
View File
@@ -10,6 +10,7 @@
blocks_air = TRUE
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
canSmoothWith = list(/turf/simulated/wall, /turf/simulated/wall/r_wall, /obj/structure/window/full, /obj/structure/window/full/phoron)
var/damage = 0
var/damage_overlay = 0
@@ -40,12 +41,6 @@
O.hide(1)
/turf/simulated/wall/Initialize(mapload, var/materialtype, var/rmaterialtype)
if(!canSmoothWith && ((smooth & SMOOTH_TRUE) || (smooth & SMOOTH_MORE)))
canSmoothWith = list(
src.type,
/obj/structure/window/full,
/obj/structure/window/full/phoron
)
. = ..()
if(!use_set_icon_state)
icon_state = "blank"
code/modules/background/citizenship/human.dm
+1 -24
View File
@@ -116,30 +116,7 @@
workplace of various contractors on board NSS Aurora."
job_species_blacklist = list(
"Consular Officer" = list(
SPECIES_HUMAN,
SPECIES_HUMAN_OFFWORLD,
SPECIES_IPC,
SPECIES_IPC_BISHOP,
SPECIES_IPC_G1,
SPECIES_IPC_G2,
SPECIES_IPC_SHELL,
SPECIES_IPC_UNBRANDED,
SPECIES_IPC_XION,
SPECIES_IPC_ZENGHU,
SPECIES_DIONA,
SPECIES_DIONA_COEUS,
SPECIES_SKRELL,
SPECIES_SKRELL_AXIORI,
SPECIES_TAJARA,
SPECIES_TAJARA_MSAI,
SPECIES_TAJARA_ZHAN,
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER
)
"Consular Officer" = ALL_SPECIES
)
/datum/citizenship/coalition
code/modules/background/citizenship/skrell.dm
+12
View File
@@ -55,3 +55,15 @@
name = "Jargon Consular Officer"
uniform = /obj/item/clothing/under/skrell
/datum/citizenship/epsilon
name = CITIZENSHIP_EUM
description = "An independent nation on the edge of Skrell space, the Co-Operative Territories of Epsilon Ursae Minoris, \
also known as the CT-EUM, is a nation primarily comprised of Dionae with a minority of skrell mostly situated \
in the city of Nral'Daaq. The CT-EUM is compromised of a myriad of smaller nations and city-states that make up \
the whole of the nation. While the nation is independent it does have heavy ties to the Jargon Federation, \
being instrumental in the nations' founding and contact with the rest of the galaxy. "
job_species_blacklist = list(
"Consular Officer" = ALL_SPECIES
)
code/modules/background/defines.dm
+1
View File
@@ -9,6 +9,7 @@
#define CITIZENSHIP_IZWESKI "Izweski Hegemony"
#define CITIZENSHIP_JARGON "Jargon Federation"
#define CITIZENSHIP_EUM "Co-Operative Territories of EUM"
#define CITIZENSHIP_PRA "People's Republic of Adhomai"
#define CITIZENSHIP_DPRA "Democratic People's Republic of Adhomai"
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+2 -3
View File
@@ -127,7 +127,6 @@
/datum/gear/eyes/blindfolds/New()
..()
var/list/blindfold = list()
blindfold["blindfold, black"] = /obj/item/clothing/glasses/sunglasses/blindfold
blindfold["blindfold, white"] = /obj/item/clothing/glasses/sunglasses/blindfold/white
blindfold["blindfold, transparent white"] = /obj/item/clothing/glasses/sunglasses/blindfold/white/seethrough
blindfold["blindfold"] = /obj/item/clothing/glasses/sunglasses/blindfold/white
blindfold["blindfold, transparent"] = /obj/item/clothing/glasses/sunglasses/blindfold/white/seethrough
gear_tweaks += new /datum/gear_tweak/path(blindfold)
code/modules/client/preference_setup/loadout/loadout_factions.dm
+6
View File
@@ -216,6 +216,12 @@
slot = slot_gloves
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_cloak
display_name = "Zeng-Hu Jargon Division cloak"
path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zavodskoi_patch
display_name = "zavodskoi sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoi
code/modules/clothing/glasses/glasses.dm
+2 -5
View File
@@ -603,15 +603,12 @@ BLIND // can't see anything
pickup_sound = 'sound/items/pickup/gloves.ogg'
/obj/item/clothing/glasses/sunglasses/blindfold/white
name = "white blindfold"
desc = "A white blindfold that covers the eyes, preventing sight."
icon_state = "blindfoldwhite"
item_state = "blindfoldwhite"
/obj/item/clothing/glasses/sunglasses/blindfold/white/seethrough
desc = "A white blindfold that covers the eyes, this one seems to be made of thinner material."
tint = TINT_MODERATE
flash_protection = FLASH_PROTECTION_MODERATE
desc = "A blindfold that covers the eyes, this one seems to be made of thinner material."
tint = TINT_NONE // It's practically a fluff thing anyway, so.
/obj/item/clothing/glasses/sunglasses/blinders
name = "vaurcae blinders"
code/modules/clothing/under/accessories/accessory.dm
+13
View File
@@ -573,6 +573,19 @@
item_state = "qeblak_cape"
flippable = FALSE
/obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng
name = "Jargon Division Zeng-Hu cloak"
desc = "This cloak is given to Zeng-Hu employees who have assisted or worked in collaboration with the Jargon Federation."
desc_fluff = "A cloak given to senior level doctors and researchers for Zeng-Hu who has \
in the past been given the privilege of working within or in collaboration with the Jargon Federation\
as a show of goodwill between the corporation and federation."
icon = 'icons/obj/contained_items/accessories/ZH_cape.dmi'
icon_override = 'icons/obj/contained_items/accessories/ZH_cape.dmi'
icon_state = "ZH_cape"
item_state = "ZH_cape"
flippable = FALSE
contained_sprite = TRUE
/obj/item/clothing/accessory/poncho/trinary
name = "trinary perfection cape"
desc = "A brilliant red and brown cape, commonly worn by those who serve the Trinary Perfection."
code/modules/customitems/item_defines.dm
+8
View File
@@ -2380,3 +2380,11 @@ All custom items with worn sprites must follow the contained sprite system: http
if(has_suit)
has_suit.verbs -= /obj/item/clothing/accessory/poncho/tajarancloak/fluff/kathira_cloak/verb/change_cloak
..()
/obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng/fluff/eden_cloak // Zeng-Hu Jargon division cloak - Eden Li - Huntime
name = "Zeng-Hu cloak: Jargon Division"
desc = "A cloak worn by Zeng-Hu personnel who worked with or in the Jargon Federation."
icon = 'icons/obj/custom_items/eden_cloak.dmi'
icon_override = 'icons/obj/custom_items/eden_cloak.dmi'
icon_state = "ZH_cape_custom"
item_state = "ZH_cape_custom"
code/modules/mob/abstract/new_player/menu.dm
+3
View File
@@ -14,6 +14,7 @@
using = new /obj/screen/new_player/title(src)
using.name = "Title"
using.hud = src
adding += using
using = new /obj/screen/new_player/selection/join_game(src)
@@ -83,6 +84,8 @@
. = ..()
/obj/screen/new_player/title/proc/Update()
if(!istype(hud) || !isnewplayer(hud.mymob))
return
lobby_index += 1
if (lobby_index > length(current_map.lobby_screens))
lobby_index = 1
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+1 -1
View File
@@ -110,7 +110,7 @@
max_hydration_factor = -1
allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_NONE)
allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_EUM, CITIZENSHIP_NONE)
allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_MOROZ, RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_NONE, RELIGION_OTHER)
allowed_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG)
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+1 -1
View File
@@ -31,7 +31,7 @@
name_language = "Encoded Audio Language"
num_alternate_languages = 2
secondary_langs = list("Encoded Audio Language", "Sol Common")
secondary_langs = list("Encoded Audio Language", "Sol Common", "Elyran Standard")
ethanol_resistance = -1//Can't get drunk
radiation_mod = 0 // not affected by radiation
remains_type = /obj/effect/decal/remains/robot
code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm
+1 -1
View File
@@ -83,7 +83,7 @@
default_h_style = "Skrell Short Tentacles"
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI)
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI, CITIZENSHIP_EUM)
allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_NONE, RELIGION_OTHER)
default_citizenship = CITIZENSHIP_JARGON
code/modules/random_map/automata/diona.dm
+1
View File
@@ -1,5 +1,6 @@
/turf/simulated/wall/diona/Initialize(mapload)
. = ..(mapload, "biomass")
canSmoothWith = list(src.type)
/obj/structure/diona
icon = 'icons/obj/diona.dmi'
code/modules/turbolift/turbolift_turfs.dm
+1
View File
@@ -1,2 +1,3 @@
/turf/simulated/wall/elevator/Initialize(mapload)
. = ..(mapload, "elevatorium")
canSmoothWith = list(src.type)
config/example/config.txt
+1
View File
@@ -551,6 +551,7 @@ CURRENT_SPACE_SECTOR Romanovich Cloud
# NTSL2+ Connection Info
NTSL_HOSTNAME localhost
NTSL_PORT 1945
NTSL_DISABLED 1
# Limit to how many hacked drones can AI have at the same time.
# HACKED_DRONES_LIMIT 5
html/changelog.html
+14
View File
@@ -35,6 +35,20 @@
-->
<div class="commit sansserif">
<h2 class="date">19 January 2022</h2>
<h3 class="author">MattAtlas updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixed exoplanet generation.</li>
</ul>
<h3 class="author">Omicega updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixed IPCs not actually getting access to Elyran Standard. Oops!</li>
</ul>
<h3 class="author">TheGreyWolf updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Skrell and diona now have a new possible citizenship, the Co-Operative Territories of Epsilon Ursae Minoris.</li>
</ul>
<h2 class="date">18 January 2022</h2>
<h3 class="author">MattAtlas updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+8
View File
@@ -22423,3 +22423,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Animals can now have natural armor.
Wowzewow:
- bugfix: Fixes sprite issues with cell chargers and APCs.
2022-01-19:
MattAtlas:
- bugfix: Fixed exoplanet generation.
Omicega:
- bugfix: Fixed IPCs not actually getting access to Elyran Standard. Oops!
TheGreyWolf:
- rscadd: Skrell and diona now have a new possible citizenship, the Co-Operative
Territories of Epsilon Ursae Minoris.
html/changelogs/ZengCloak.yml
+6
View File
@@ -0,0 +1,6 @@
author: TheGreyWolf
delete-after: True
changes:
- rscadd: "Added the zeng-hu jargon division cloak to the loadout under factions."
html/changelogs/geeves-startup_runtimes.yml
+6
View File
@@ -0,0 +1,6 @@
author: Geevesy
delete-after: True
changes:
- backend: "Fixed a couple of roundstart runtimes, added an option in the config to disable NTSL."
html/changelogs/mattatlas-exoplanetfixes.yml → html/changelogs/mattatlas-clienttimers.yml
+1 -1
View File
@@ -38,4 +38,4 @@ delete-after: True
# 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:
- bugfix: "Fixed exoplanet generation."
- bugfix: "The main menu no longer spams client time timers."
html/changelogs/responderlabeler.yml
+6
View File
@@ -0,0 +1,6 @@
author: Sparky_hotdog
delete-after: True
changes:
- maptweak: "Added a hand labeler to the desk in the First Responder bay."
html/changelogs/smootherwalls.yml
+6
View File
@@ -0,0 +1,6 @@
author: Sparky_hotdog
delete-after: True
changes:
- bugfix: "Fixed a few walls not smoothing properly."
html/changelogs/wallsmooth.yml
+14
View File
@@ -0,0 +1,14 @@
################################
# 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.
#
author: Sparky_hotdog
delete-after: True
changes:
- bugfix: "Fixed regular and reinforced walls not smoothing properly."
html/changelogs/wezzy_blindfoldfix.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: Wowzewow (Wezzy)
# 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:
- bugfix: "Seethrough blindfolds are actually see-through again."
- bugfix: "Recolored blindfolds no longer are called white. Check your loadouts."
- balance: "Seethrough blindfolds no longer provide flash protection."
icons/obj/contained_items/accessories/zh_cape.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 487 B

icons/obj/custom_items/eden_cloak.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 494 B

maps/aurora/aurora-4_mainlevel.dmm
+1
View File
@@ -44531,6 +44531,7 @@
/obj/machinery/vending/wallmed1{
pixel_y = -30
},
/obj/item/device/hand_labeler,
/turf/simulated/floor/tiled,
/area/medical/first_responder)
"bBH" = (
tools/requirements.txt
+1 -1
View File
@@ -1,5 +1,5 @@
pygit2==1.4.0
bidict==0.21.2
Pillow==8.3.2
Pillow==9.0.0
PyYAML==5.4.1
beautifulsoup4==4.10.0
vueui/package-lock.json
Generated
+7 -15
View File
@@ -5752,7 +5752,7 @@
"dependencies": {
"globby": {
"version": "6.1.0",
"resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
"dev": true,
"requires": {
@@ -5765,7 +5765,7 @@
"dependencies": {
"pify": {
"version": "2.3.0",
"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
@@ -6934,9 +6934,9 @@
}
},
"follow-redirects": {
"version": "1.13.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
"integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
"version": "1.14.7",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
"integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
"dev": true
},
"for-in": {
@@ -12676,7 +12676,6 @@
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
@@ -12688,7 +12687,6 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
@@ -12698,7 +12696,6 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -12709,7 +12706,6 @@
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
@@ -12718,22 +12714,19 @@
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
"dev": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
"dev": true
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@@ -12745,7 +12738,6 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}