diff --git a/aurorastation.dme b/aurorastation.dme
index 515cd04bd48..71d6e4eed9b 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -1367,6 +1367,7 @@
#include "code\modules\clothing\chameleon.dm"
#include "code\modules\clothing\clothing.dm"
#include "code\modules\clothing\clothing_accessories.dm"
+#include "code\modules\clothing\ears\antennae.dm"
#include "code\modules\clothing\ears\bandanna.dm"
#include "code\modules\clothing\ears\earmuffs.dm"
#include "code\modules\clothing\ears\earrings.dm"
@@ -1536,7 +1537,6 @@
#include "code\modules\detectivework\tools\storage.dm"
#include "code\modules\detectivework\tools\swabs.dm"
#include "code\modules\detectivework\tools\uvlight.dm"
-#include "code\modules\economy\Accounts_DB.dm"
#include "code\modules\economy\ATM.dm"
#include "code\modules\economy\cash.dm"
#include "code\modules\economy\economy_misc.dm"
@@ -2202,6 +2202,7 @@
#include "code\modules\modular_computers\file_system\programs\civilian\cargo_order.dm"
#include "code\modules\modular_computers\file_system\programs\civilian\crusher_control.dm"
#include "code\modules\modular_computers\file_system\programs\civilian\janitor.dm"
+#include "code\modules\modular_computers\file_system\programs\command\account_database.dm"
#include "code\modules\modular_computers\file_system\programs\command\card.dm"
#include "code\modules\modular_computers\file_system\programs\command\comm.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\_engineering.dm"
diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm
index a7b6e91ab43..54bb896bc5c 100644
--- a/code/__defines/items_clothing.dm
+++ b/code/__defines/items_clothing.dm
@@ -97,6 +97,8 @@
#define slot_w_uniform_str "slot_w_uniform"
#define slot_head_str "slot_head"
#define slot_wear_suit_str "slot_suit"
+#define slot_l_ear_str "slot_l_ear"
+#define slot_r_ear_str "slot_r_ear"
#define slot_shoes_str "slot_shoes"
//itemstate suffixes. Used for containedsprite worn items
diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index 92ba7e73108..0daa8464f1c 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -183,18 +183,20 @@
#define ROBOT_NOTIFICATION_MODULE_RESET 4
// Appearance change flags
-#define APPEARANCE_UPDATE_DNA 0x1
-#define APPEARANCE_RACE (0x2|APPEARANCE_UPDATE_DNA)
-#define APPEARANCE_GENDER (0x4|APPEARANCE_UPDATE_DNA)
-#define APPEARANCE_SKIN 0x8
-#define APPEARANCE_HAIR 0x10
-#define APPEARANCE_HAIR_COLOR 0x20
-#define APPEARANCE_FACIAL_HAIR 0x40
-#define APPEARANCE_FACIAL_HAIR_COLOR 0x80
-#define APPEARANCE_EYE_COLOR 0x100
-#define APPEARANCE_ALL_HAIR (APPEARANCE_HAIR|APPEARANCE_HAIR_COLOR|APPEARANCE_FACIAL_HAIR|APPEARANCE_FACIAL_HAIR_COLOR)
-#define APPEARANCE_ALL 0xFFFF
-#define APPEARANCE_PLASTICSURGERY (APPEARANCE_ALL & ~APPEARANCE_RACE)
+#define APPEARANCE_UPDATE_DNA 1
+#define APPEARANCE_RACE (2|APPEARANCE_UPDATE_DNA)
+#define APPEARANCE_GENDER (4|APPEARANCE_UPDATE_DNA)
+#define APPEARANCE_SKIN 8
+#define APPEARANCE_HAIR 16
+#define APPEARANCE_HAIR_COLOR 32
+#define APPEARANCE_FACIAL_HAIR 64
+#define APPEARANCE_FACIAL_HAIR_COLOR 128
+#define APPEARANCE_EYE_COLOR 256
+#define APPEARANCE_ACCENT 512
+#define APPEARANCE_LANGUAGE 1024
+#define APPEARANCE_ALL 65535
+#define APPEARANCE_ALL_HAIR (APPEARANCE_HAIR|APPEARANCE_HAIR_COLOR|APPEARANCE_FACIAL_HAIR|APPEARANCE_FACIAL_HAIR_COLOR)
+#define APPEARANCE_PLASTICSURGERY (APPEARANCE_ALL & ~APPEARANCE_RACE)
// Click cooldown
#define DEFAULT_ATTACK_COOLDOWN 8 //Default timeout for aggressive actions
@@ -212,6 +214,8 @@
#define INV_W_UNIFORM_DEF_ICON 'icons/mob/uniform.dmi'
#define INV_ACCESSORIES_DEF_ICON 'icons/mob/ties.dmi'
#define INV_SUIT_DEF_ICON 'icons/mob/suit.dmi'
+#define INV_L_EAR_DEF_ICON 'icons/mob/l_ear.dmi'
+#define INV_R_EAR_DEF_ICON 'icons/mob/r_ear.dmi'
#define INV_SHOES_DEF_ICON 'icons/mob/feet.dmi'
// IPC tags
diff --git a/code/controllers/subsystems/economy.dm b/code/controllers/subsystems/economy.dm
index e4cbd716293..d4b4df5027e 100644
--- a/code/controllers/subsystems/economy.dm
+++ b/code/controllers/subsystems/economy.dm
@@ -95,7 +95,7 @@ var/datum/controller/subsystem/economy/SSeconomy
return TRUE
//Create a "normal" player account
-/datum/controller/subsystem/economy/proc/create_account(var/new_owner_name = "Default user", var/starting_funds = 0, var/obj/machinery/account_database/source_db)
+/datum/controller/subsystem/economy/proc/create_account(var/new_owner_name = "Default user", var/starting_funds = 0, var/datum/computer_file/program/account_db/source_db)
//create a new account
var/datum/money_account/M = new()
M.owner_name = new_owner_name
@@ -120,31 +120,28 @@ var/datum/controller/subsystem/economy/SSeconomy
T.time = worldtime2text()
T.source_terminal = source_db.machine_id
- //create a sealed package containing the account details
- var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(source_db.loc)
+ if(source_db.computer.nano_printer)
+ var/pname = "Account information: [M.owner_name]"
+ var/info = "Account details (confidential)
+
09 January 2021
+
Ferner updated:
+
+ - Purged the last remnants of Christmas from the engineering sublevel.
+
+
WickedCybs updated:
+
+ - Adjusts Tajara body patterns, many will now colour better, look a bit cleaner and no longer give the species a plantigrade apperance. The native footwear was also tweaked to fit better, check it out. Please note that a small number of these patterns had their names slightly changed for consistencies sake, so you may need to reapply a few. Copy the RGB value on your now blank patterns to make that easier.
+ - Along with the changes to the old, added new and unused body patterns for Tajara, as well as differing male/female versions where applicable. Two new hairstyles as well. Bangs alt and Short Fringe.
+
+
Wowzewow (Wezzy) updated:
+
+ - Fixes rustle1.ogg.
+ - New vaurca antenna twitch, zippo, wall hitting and announcement sounds.
+
+
+
08 January 2021
+
MattAtlas updated:
+
+ - Fixed borgs teleporting items into oblivion and funky table alignment antics.
+
+
WickedCybs updated:
+
+ - Tweaked the Unathi hand sprite. The claws should be in the proper place now.
+ - Tweaked the Unathi claws (hand) body pattern to match where the claws should actually be.
+
+
+
07 January 2021
+
Arrow768 updated:
+
+ - Removes the liver damage from the synaptizine as it regularly kills antags that use the Sideeffect-Be-Gone Injectors.
+
+
Geeves updated:
+
+ - Emergency shield generators no longer infinitely stack shields when you use tape.
+ - You can now reply to a chat even without a channel active.
+ - Direct messaging will no longer fail silently if you're the only client active.
+ - The sparks psionic ability now properly generates sparks, and no longer disallows you from operating your inventory.
+ - Ling fakedeath now properly updates the medhud.
+
+
+
06 January 2021
+
Arrow768 updated:
+
+ - It is no longer possible to disable NTNet wireless via the NTNet Monitor. Use the NTNet Relay instead.
+
+
Geeves updated:
+
+ - Fixed table placement alignment.
+
+
MattAtlas updated:
+
+ - Added a language selector to the appearance editor that you get when you spawn in as a mercenary or use a plastic surgery machine.
+
+
+
05 January 2021
+
Alberyk, Wowzewow (Wezzy) updated:
+
+ - Added a Northern Ras'nrr Siik'maas accent.
+
+
Doxxmedearly updated:
+
+ - Parasitic infections (such as k'ois) now have some randomization regarding progression speed.
+
+
Geeves updated:
+
+ - Fixed blood overlays not disappearing when mobs are completely healed.
+
+
MattAtlas updated:
+
+ - High damage bullets will now gib limbs instead of tearing them off.
+ - Fixed projectile maim bonuses not being applied and some other projectile-related bugs.
+
+
Mwahahaha, MattAtlas updated:
+
+ - Added a lot of new body markings such as tattoos and augments for humans and other speciess.
+
+
+
04 January 2021
+
Geeves updated:
+
+ - Replaced the accounts terminal with a modular console.
+
+
Karolis2011 updated:
+
+ - Ported the accounts terminal UI over to VueUI.
+
+
MattAtlas updated:
+
+ - Disabilities are now cleared when you spawn in as a mercenary, raider and so on.
+
+
Wowzewow (Wezzy) updated:
+
+ - Running in impractical shoes has a chance for you to trip over.
+ - Adds animations to putting stuff down as well as putting things in disposals.
+
+
+
03 January 2021
+
Wowzewow (Wezzy) updated:
+
+ - Left ear and right ear mob icons have been differentiated. You can now tell which ear someone has something in.
+
+
02 January 2021
Geeves updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a46cce4468a..6a89b278818 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17770,3 +17770,80 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Lethal disruptor shots now do 20 burn damage, down from 30.
- tweak: Lethal disruptor shots no longer pass through windows and grilles.
- tweak: Stun disruptor shots now do 25 agony damage, down from 45.
+2021-01-03:
+ Wowzewow (Wezzy):
+ - rscadd: Left ear and right ear mob icons have been differentiated. You can now
+ tell which ear someone has something in.
+2021-01-04:
+ Geeves:
+ - rscadd: Replaced the accounts terminal with a modular console.
+ Karolis2011:
+ - rscadd: Ported the accounts terminal UI over to VueUI.
+ MattAtlas:
+ - bugfix: Disabilities are now cleared when you spawn in as a mercenary, raider
+ and so on.
+ Wowzewow (Wezzy):
+ - rscadd: Running in impractical shoes has a chance for you to trip over.
+ - rscadd: Adds animations to putting stuff down as well as putting things in disposals.
+2021-01-05:
+ Alberyk, Wowzewow (Wezzy):
+ - rscadd: Added a Northern Ras'nrr Siik'maas accent.
+ Doxxmedearly:
+ - tweak: Parasitic infections (such as k'ois) now have some randomization regarding
+ progression speed.
+ Geeves:
+ - bugfix: Fixed blood overlays not disappearing when mobs are completely healed.
+ MattAtlas:
+ - tweak: High damage bullets will now gib limbs instead of tearing them off.
+ - bugfix: Fixed projectile maim bonuses not being applied and some other projectile-related
+ bugs.
+ Mwahahaha, MattAtlas:
+ - rscadd: Added a lot of new body markings such as tattoos and augments for humans
+ and other speciess.
+2021-01-06:
+ Arrow768:
+ - rscdel: It is no longer possible to disable NTNet wireless via the NTNet Monitor.
+ Use the NTNet Relay instead.
+ Geeves:
+ - bugfix: Fixed table placement alignment.
+ MattAtlas:
+ - rscadd: Added a language selector to the appearance editor that you get when you
+ spawn in as a mercenary or use a plastic surgery machine.
+2021-01-07:
+ Arrow768:
+ - rscdel: Removes the liver damage from the synaptizine as it regularly kills antags
+ that use the Sideeffect-Be-Gone Injectors.
+ Geeves:
+ - bugfix: Emergency shield generators no longer infinitely stack shields when you
+ use tape.
+ - bugfix: You can now reply to a chat even without a channel active.
+ - bugfix: Direct messaging will no longer fail silently if you're the only
+ client active.
+ - bugfix: The sparks psionic ability now properly generates sparks, and no longer
+ disallows you from operating your inventory.
+ - bugfix: Ling fakedeath now properly updates the medhud.
+2021-01-08:
+ MattAtlas:
+ - bugfix: Fixed borgs teleporting items into oblivion and funky table alignment
+ antics.
+ WickedCybs:
+ - tweak: Tweaked the Unathi hand sprite. The claws should be in the proper place
+ now.
+ - tweak: Tweaked the Unathi claws (hand) body pattern to match where the claws should
+ actually be.
+2021-01-09:
+ Ferner:
+ - maptweak: Purged the last remnants of Christmas from the engineering sublevel.
+ WickedCybs:
+ - tweak: Adjusts Tajara body patterns, many will now colour better, look a bit cleaner
+ and no longer give the species a plantigrade apperance. The native footwear
+ was also tweaked to fit better, check it out. Please note that a small number
+ of these patterns had their names slightly changed for consistencies sake, so
+ you may need to reapply a few. Copy the RGB value on your now blank patterns
+ to make that easier.
+ - rscadd: Along with the changes to the old, added new and unused body patterns
+ for Tajara, as well as differing male/female versions where applicable. Two
+ new hairstyles as well. Bangs alt and Short Fringe.
+ Wowzewow (Wezzy):
+ - bugfix: Fixes rustle1.ogg.
+ - soundadd: New vaurca antenna twitch, zippo, wall hitting and announcement sounds.
diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi
index 1907a7227a9..83a24f4de13 100644
Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ
diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi
deleted file mode 100644
index d25d596d8ef..00000000000
Binary files a/icons/mob/ears.dmi and /dev/null differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index c8cdccd2249..121734bc19d 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human_face/msai_hair.dmi b/icons/mob/human_face/msai_hair.dmi
index bd693a366d7..b2af36f3332 100644
Binary files a/icons/mob/human_face/msai_hair.dmi and b/icons/mob/human_face/msai_hair.dmi differ
diff --git a/icons/mob/human_face/tajara_hair.dmi b/icons/mob/human_face/tajara_hair.dmi
index abf0175dc32..e7ac3fcedb9 100644
Binary files a/icons/mob/human_face/tajara_hair.dmi and b/icons/mob/human_face/tajara_hair.dmi differ
diff --git a/icons/mob/human_races/markings.dmi b/icons/mob/human_races/markings.dmi
index 9f3475a6232..d3bfb48c4cd 100644
Binary files a/icons/mob/human_races/markings.dmi and b/icons/mob/human_races/markings.dmi differ
diff --git a/icons/mob/human_races/markings_unathi.dmi b/icons/mob/human_races/markings_unathi.dmi
index 1f7f0bbc4e9..c67d1fb9eaf 100644
Binary files a/icons/mob/human_races/markings_unathi.dmi and b/icons/mob/human_races/markings_unathi.dmi differ
diff --git a/icons/mob/human_races/unathi/r_lizard.dmi b/icons/mob/human_races/unathi/r_lizard.dmi
index 4ef1e7bf767..7cd8851ad31 100644
Binary files a/icons/mob/human_races/unathi/r_lizard.dmi and b/icons/mob/human_races/unathi/r_lizard.dmi differ
diff --git a/icons/mob/l_ear.dmi b/icons/mob/l_ear.dmi
new file mode 100644
index 00000000000..79ca242df37
Binary files /dev/null and b/icons/mob/l_ear.dmi differ
diff --git a/icons/mob/r_ear.dmi b/icons/mob/r_ear.dmi
new file mode 100644
index 00000000000..67b410b08d0
Binary files /dev/null and b/icons/mob/r_ear.dmi differ
diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi
index 9df93845ebd..e3eb9831eeb 100644
Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 2cc96bc02ca..4b4ea5c8aa5 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi
index 3c133879fbe..7756fc16a86 100644
Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 49040aa88a2..fb4a3567d1c 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -31045,7 +31045,7 @@
},
/area/centcom/holding)
"qjS" = (
-/obj/machinery/account_database{
+/obj/item/modular_computer/console/preset/command/account{
name = "CentComm Accounts database"
},
/turf/unsimulated/floor{
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 42776675298..92351caf3d4 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -914,7 +914,6 @@
/obj/machinery/light{
icon_state = "tube1"
},
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"ack" = (
@@ -3234,9 +3233,6 @@
/obj/machinery/alarm{
pixel_y = 28
},
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"ahM" = (
@@ -3502,7 +3498,6 @@
icon_state = "1-4"
},
/obj/effect/floor_decal/corner_wide/yellow/full,
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"ain" = (
@@ -3804,7 +3799,6 @@
name = "Break Room";
req_one_access = null
},
-/obj/structure/sign/christmas/wreath,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"aiP" = (
@@ -4145,9 +4139,6 @@
/obj/structure/sign/nosmoking_2{
pixel_x = 32
},
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"ajx" = (
@@ -4156,12 +4147,6 @@
dir = 8
},
/obj/machinery/disposal,
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"ajy" = (
@@ -4318,13 +4303,6 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
-"ajQ" = (
-/obj/structure/flora/pottedplant/random,
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/engineering/break_room)
"ajR" = (
/obj/structure/window/reinforced,
/obj/machinery/chem_master,
@@ -4455,9 +4433,6 @@
/obj/effect/floor_decal/corner/white/diagonal,
/obj/structure/table/standard,
/obj/machinery/chemical_dispenser/coffee/full,
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"akn" = (
@@ -4689,9 +4664,6 @@
icon_state = "tube1"
},
/obj/machinery/firealarm/north,
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"akK" = (
@@ -5164,9 +5136,6 @@
dir = 4;
icon_state = "pipe-c"
},
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"alN" = (
@@ -26028,7 +25997,6 @@
/area/maintenance/medsublevel_port)
"bwQ" = (
/obj/machinery/firealarm/south,
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"bBR" = (
@@ -26190,9 +26158,6 @@
dir = 4;
icon_state = "tube1"
},
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"bVc" = (
@@ -26289,13 +26254,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/medsublevel_port)
-"cdf" = (
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/engineering/break_room)
"cdr" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
@@ -26847,10 +26805,6 @@
"dbo" = (
/obj/effect/floor_decal/corner/white/diagonal,
/obj/machinery/vending/snack,
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"dbr" = (
@@ -26944,15 +26898,6 @@
},
/turf/simulated/floor/tiled/white,
/area/maintenance/medsublevel_port)
-"dkd" = (
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
-/area/engineering/break_room)
"dlv" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -27116,7 +27061,6 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"dHl" = (
@@ -28128,13 +28072,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/wall/r_wall,
/area/rnd/xenobiology/xenoflora)
-"fyK" = (
-/obj/structure/bed/chair/comfy/beige,
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/engineering/break_room)
"fzF" = (
/obj/structure/table/steel,
/obj/item/device/flashlight/lamp,
@@ -28301,7 +28238,6 @@
name = "Staff Smoking Lounge";
req_one_access = null
},
-/obj/structure/sign/christmas/wreath,
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"fVA" = (
@@ -28410,13 +28346,6 @@
},
/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
-"gdx" = (
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/engineering/break_room)
"ged" = (
/obj/machinery/door/firedoor,
/obj/structure/window/phoronreinforced{
@@ -28719,7 +28648,6 @@
"gBM" = (
/obj/effect/floor_decal/corner/white/diagonal,
/obj/machinery/vending/cola,
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"gCb" = (
@@ -28808,12 +28736,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/backup_SMES)
-"gMy" = (
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/engineering/break_room)
"gPx" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/window{
@@ -28894,12 +28816,6 @@
/area/maintenance/medsublevel_port)
"gYj" = (
/obj/machinery/vending/cigarette,
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"gYx" = (
@@ -30461,15 +30377,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/scisublevel)
-"kPN" = (
-/obj/structure/bed/chair/comfy/beige{
- dir = 1
- },
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/engineering/break_room)
"kQh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -30680,9 +30587,6 @@
/obj/effect/floor_decal/corner/white/diagonal,
/obj/structure/table/standard,
/obj/machinery/chemical_dispenser/bar_soft/full,
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"lmV" = (
@@ -30712,9 +30616,6 @@
/turf/simulated/floor/tiled/freezer,
/area/engineering/bathroom)
"loD" = (
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"lsl" = (
@@ -30738,13 +30639,6 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology/xenoflora)
-"lxo" = (
-/obj/structure/table/glass,
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/engineering/break_room)
"lBF" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -30820,10 +30714,6 @@
/area/mine/unexplored)
"lPA" = (
/obj/structure/flora/pottedplant/random,
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"lQi" = (
@@ -31106,7 +30996,6 @@
/obj/machinery/light{
icon_state = "tube1"
},
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"mpr" = (
@@ -31114,10 +31003,6 @@
dir = 1
},
/obj/machinery/disposal,
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"mpG" = (
@@ -31404,16 +31289,6 @@
/obj/item/storage/box/drinkingglasses,
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_hallway)
-"mHK" = (
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/turf/simulated/floor/tiled,
-/area/engineering/break_room)
"mHO" = (
/obj/effect/floor_decal/corner/lime{
dir = 9
@@ -31827,14 +31702,6 @@
},
/turf/simulated/open,
/area/maintenance/engsublevel)
-"nqI" = (
-/obj/structure/table/glass,
-/obj/item/material/ashtray/bronze,
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/engineering/break_room)
"nqY" = (
/obj/structure/closet/excavation,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -31863,7 +31730,6 @@
pixel_y = -30;
req_access = list(10)
},
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"nvZ" = (
@@ -32938,10 +32804,6 @@
"pOl" = (
/obj/machinery/computer/security/engineering,
/obj/effect/floor_decal/corner/white/diagonal,
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"pQb" = (
@@ -33223,7 +33085,6 @@
"qnn" = (
/obj/effect/floor_decal/corner/white/diagonal,
/obj/machinery/vending/coffee,
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"qnt" = (
@@ -33238,9 +33099,6 @@
/area/maintenance/medsublevel_port)
"qpJ" = (
/obj/machinery/hologram/holopad,
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"qqf" = (
@@ -33259,9 +33117,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
"qsc" = (
@@ -34111,16 +33966,6 @@
},
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
-"sjb" = (
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/engineering/break_room)
"smA" = (
/obj/machinery/power/breakerbox/activated{
RCon_tag = "Engineering Sublevel Substation Bypass"
@@ -35375,9 +35220,6 @@
/obj/machinery/newscaster{
pixel_x = 30
},
-/obj/structure/sign/christmas/lights{
- dir = 4
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"uVg" = (
@@ -35416,12 +35258,6 @@
desc = "A box full of snack foods. A label is attached that reads, 'Sorry about the microwaves.'";
name = "corporate care package"
},
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"uZy" = (
@@ -35441,18 +35277,6 @@
},
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
-"vbk" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/corner_wide/yellow{
- dir = 10
- },
-/obj/structure/sign/christmas/lights,
-/turf/simulated/floor/tiled,
-/area/outpost/engineering/hallway)
"vbA" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/dirt,
@@ -36322,7 +36146,6 @@
"wHR" = (
/obj/effect/floor_decal/corner/white/diagonal,
/obj/machinery/computer/power_monitor,
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"wIo" = (
@@ -36730,7 +36553,6 @@
/obj/effect/floor_decal/corner_wide/yellow{
dir = 10
},
-/obj/structure/sign/christmas/lights,
/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"xxg" = (
@@ -37109,9 +36931,6 @@
pixel_x = 1;
pixel_y = 4
},
-/obj/structure/sign/christmas/lights{
- dir = 8
- },
/turf/simulated/floor/tiled,
/area/engineering/break_room)
"ydL" = (
@@ -48595,11 +48414,11 @@ aaa
aaa
aaa
lYK
-dkd
-fyK
-lxo
-nqI
-kPN
+loD
+jhN
+swb
+akj
+eEH
alM
mpr
lYK
@@ -49367,8 +49186,8 @@ aaa
aaa
lYK
gYj
-ajQ
-gMy
+lPA
+loD
qpJ
dvo
qqB
@@ -49885,7 +49704,7 @@ ycW
akm
lkK
xNS
-mHK
+ajv
dbo
lYK
aaa
@@ -50394,7 +50213,7 @@ pmn
ahI
xxd
uqb
-cdf
+ajs
bVc
akn
akn
@@ -50649,9 +50468,9 @@ bKt
mlz
hZh
eby
-vbk
+ain
dbr
-cdf
+ajs
ajT
rmO
rmO
@@ -51163,9 +50982,9 @@ agt
owL
ahi
ahK
-vbk
+ain
uqb
-sjb
+ajv
xrn
rmO
rmO
@@ -51420,9 +51239,9 @@ agu
owL
oXU
vhT
-vbk
+ain
dbr
-sjb
+ajv
ajV
gfC
gfC
@@ -51677,14 +51496,14 @@ wdi
owL
gDm
tZw
-vbk
+ain
vly
ajx
-gdx
+ajs
ajw
bTq
uTq
-gdx
+ajs
pOl
lYK
aaa
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index f479c8ca79a..02bd5a2f3aa 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -20502,7 +20502,7 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
"aIQ" = (
-/obj/machinery/account_database,
+/obj/item/modular_computer/console/preset/command/account,
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
"aIR" = (
@@ -32692,7 +32692,7 @@
name = "Desk Privacy Shutter";
pixel_y = -36
},
-/obj/machinery/account_database,
+/obj/item/modular_computer/console/preset/command/account,
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop)
"bec" = (
diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm
index 47c78a81743..9af57e2be6b 100644
--- a/maps/exodus/exodus-1_station.dmm
+++ b/maps/exodus/exodus-1_station.dmm
@@ -42645,7 +42645,7 @@
/obj/machinery/keycard_auth{
pixel_x = -24
},
-/obj/machinery/account_database,
+/obj/item/modular_computer/console/preset/command/account,
/obj/effect/floor_decal/corner/blue/full{
dir = 8
},
diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm
index 90d67e9bae6..a703d5ff281 100644
--- a/maps/exodus/exodus-2_centcomm.dmm
+++ b/maps/exodus/exodus-2_centcomm.dmm
@@ -10974,7 +10974,7 @@
/turf/simulated/floor/tiled,
/area/merchant_station)
"aNJ" = (
-/obj/machinery/account_database{
+/obj/item/modular_computer/console/preset/command/account{
name = "CentComm Accounts database"
},
/turf/unsimulated/floor{
diff --git a/maps/runtime/runtime-1.dmm b/maps/runtime/runtime-1.dmm
index 21cca74fa5a..6c5c0f22c4d 100644
--- a/maps/runtime/runtime-1.dmm
+++ b/maps/runtime/runtime-1.dmm
@@ -250,8 +250,8 @@
},
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 8
+ dir = 8;
+ must_start_working = 1
},
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -388,8 +388,8 @@
"aU" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 4
+ dir = 4;
+ must_start_working = 1
},
/turf/simulated/floor/tiled/dark,
/area/engineering/gravity_gen)
@@ -579,8 +579,8 @@
"bw" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 8
+ dir = 8;
+ must_start_working = 1
},
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
@@ -734,8 +734,8 @@
"bR" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 1
+ dir = 1;
+ must_start_working = 1
},
/obj/structure/closet/emcloset,
/obj/effect/floor_decal/corner/blue{
@@ -919,8 +919,8 @@
"ck" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 4
+ dir = 4;
+ must_start_working = 1
},
/turf/simulated/floor/tiled,
/area/hallway/primary/central_one)
@@ -948,7 +948,7 @@
/obj/effect/floor_decal/corner/blue/full{
dir = 4
},
-/obj/machinery/account_database,
+/obj/item/modular_computer/console/preset/command/account,
/turf/simulated/floor/tiled,
/area/bridge)
"co" = (
@@ -963,8 +963,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 8
+ dir = 8;
+ must_start_working = 1
},
/turf/simulated/floor/tiled,
/area/hallway/primary/central_one)
@@ -1007,8 +1007,8 @@
},
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 1
+ dir = 1;
+ must_start_working = 1
},
/obj/effect/floor_decal/corner/blue{
dir = 4
@@ -1045,8 +1045,8 @@
},
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 1
+ dir = 1;
+ must_start_working = 1
},
/obj/effect/floor_decal/corner/blue{
dir = 1
@@ -1254,8 +1254,8 @@
"dd" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 8
+ dir = 8;
+ must_start_working = 1
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -1268,8 +1268,8 @@
"df" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 4
+ dir = 4;
+ must_start_working = 1
},
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -1279,16 +1279,16 @@
"dg" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 8
+ dir = 8;
+ must_start_working = 1
},
/turf/simulated/floor/plating,
/area/storage/primary)
"dh" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 4
+ dir = 4;
+ must_start_working = 1
},
/turf/simulated/floor/plating,
/area/storage/primary)
@@ -1508,8 +1508,8 @@
"ob" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 8
+ dir = 8;
+ must_start_working = 1
},
/obj/structure/cable{
d1 = 1;
@@ -1612,8 +1612,8 @@
"HK" = (
/obj/machinery/light{
brightness_range = 16;
- must_start_working = 1;
- dir = 8
+ dir = 8;
+ must_start_working = 1
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -1684,9 +1684,7 @@
/turf/simulated/floor/tiled,
/area/hallway/primary/central_one)
"WS" = (
-/obj/turbolift_map_holder/runtime{
- dir = 8
- },
+/obj/turbolift_map_holder/runtime,
/turf/simulated/floor/plating,
/area/turbolift/main_station)
"YP" = (
diff --git a/nano/templates/accounts_terminal.tmpl b/nano/templates/accounts_terminal.tmpl
deleted file mode 100644
index ed02db64f0f..00000000000
--- a/nano/templates/accounts_terminal.tmpl
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
- Machine:
-
-
- {{:data.machine_id}}
-
-
-
-
- ID:
-
-
- {{:helper.link(data.id_card, 'eject', {'choice' : "insert_card"}, null, data.id_inserted ? 'fixedLeftWidest' : 'fixedLeft')}}
-
-
-
-{{if data.access_level > 0}}
-
-
Menu
-
- {{:helper.link('Home', 'home', {'choice' : 'view_accounts_list'}, !data.creating_new_account && !data.detailed_account_view ? 'disabled' : null, 'fixedLeft')}}
- {{:helper.link('New Account', 'gear', {'choice' : 'create_account'}, data.creating_new_account ? 'disabled' : null, 'fixedLeft')}}
- {{:helper.link('Print', 'print', {'choice' : 'print'}, data.creating_new_account ? 'disabled' : null, 'fixedLeft')}}
-
- {{if data.creating_new_account}}
-
-
Create Account
-
-
-
- {{else}}
- {{if data.detailed_account_view}}
-
-
Account Details
-
-
-
-
- Account Number:
-
-
- #{{:data.account_number}}
-
-
-
-
-
- Holder:
-
-
- {{:data.owner_name}}
-
-
-
-
-
- Balance:
-
-
- ${{:helper.formatNumber(data.money)}}
-
-
-
-
-
- Status:
-
-
-
- {{:data.suspended ? "Suspended" : "Active"}}
-
-
-
-
- {{:helper.link(data.suspended ? "Unsuspend" : "Suspend", 'gear', {'choice' : 'toggle_suspension'})}}
-
-
-
- {{if data.transactions}}
-
-
-
- | Timestamp |
- Target |
- Reason |
- Value |
- Terminal |
-
-
-
- {{for data.transactions}}
-
- | {{:value.date}} {{:value.time}} |
- {{:value.target_name}} |
- {{:value.purpose}} |
- {{:value.amount}} |
- {{:value.source_terminal}} |
-
- {{/for}}
-
-
- {{else}}
-
This account has no financial transactions on record for today.
- {{/if}}
-
-
-
CentCom Administrator
-
-
-
- Payroll:
-
- {{:helper.link('Revoke', 'transferthick-e-w', {'choice' : 'revoke_payroll'}, data.account_number == data.station_account_number ? 'disabled' : null, 'linkDanger')}}
-
- {{if data.access_level >= 2}}
-
-
- Silent Fund Adjustment:
-
- {{:helper.link('Add', 'plus', {'choice' : 'add_funds'})}}
- {{:helper.link('Remove', 'minus', {'choice' : 'remove_funds'})}}
-
- {{/if}}
- {{else}}
-
-
-
Idris Banking Accounts
-
- {{if data.accounts}}
-
- {{for data.accounts}}
-
- | {{:helper.link('#' + value.account_number, '', {'choice' : 'view_account_detail', 'account_number' : value.account_number})}} |
- {{:value.owner_name}} |
- {{:value.suspended}} |
-
- {{/for}}
-
- {{else}}
-
There are no accounts available.
- {{/if}}
- {{/if}}
- {{/if}}
-{{/if}}
diff --git a/nano/templates/appearance_changer.tmpl b/nano/templates/appearance_changer.tmpl
index 2f9eb3f78af..3d645edfbc2 100644
--- a/nano/templates/appearance_changer.tmpl
+++ b/nano/templates/appearance_changer.tmpl
@@ -36,6 +36,19 @@
{{/if}}
+{{if data.change_language}}
+
+
+ Languages:
+
+
+ {{for data.languages}}
+ {{:helper.link(value.language, null, { 'language' : value.language}, null, null)}}
+ {{/for}}
+
+
+{{/if}}
+
{{if data.change_eye_color || data.change_skin_tone || data.change_skin_color || data.change_hair_color || data.change_facial_hair_color}}