Skip to content

Commit

Permalink
Merge branch 'combo' into Мердж-с-оффами
Browse files Browse the repository at this point in the history 
Signed-off-by: Mirag1993 <[email protected]>
  • Loading branch information
@Mirag1993
Mirag1993 authored Nov 9, 2023
2 parents 70463ae + 6aa28d8 commit 89925fc
Show file tree
Hide file tree
Showing 9 changed files with 151 additions and 42 deletions.
16 changes: 8 additions & 8 deletions _maps/shuttles/syndicate/syndicate_cybersun_remora.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@
dir = 8
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"aq" = (
Expand All @@ -98,10 +98,10 @@
/area/ship/hallway/central)
"at" = (
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/light/directional/east,
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"au" = (
Expand Down Expand Up @@ -365,13 +365,13 @@
},
/obj/structure/window/reinforced,
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/machinery/door/firedoor/border_only,
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"aV" = (
Expand All @@ -385,10 +385,10 @@
"aX" = (
/obj/structure/window/reinforced,
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/door/firedoor/border_only,
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"aY" = (
Expand Down Expand Up @@ -1121,7 +1121,6 @@
dir = 1
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/cybersun,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/door/firedoor/border_only{
dir = 8
Expand All @@ -1130,6 +1129,7 @@
dir = 1
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"ct" = (
Expand All @@ -1145,12 +1145,12 @@
dir = 1
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/cybersun,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"cv" = (
Expand Down Expand Up @@ -1327,12 +1327,12 @@
dir = 8
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/cybersun,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"cL" = (
Expand Down Expand Up @@ -2264,10 +2264,10 @@
/area/ship/hallway/central)
"ey" = (
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/cybersun,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/light/directional/east,
/obj/item/tank/jetpack/carbondioxide,
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"ez" = (
Expand Down
9 changes: 6 additions & 3 deletions code/__byond_version_compat.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
#error Please consider upgrading to 514.1577 or above.
#endif

#if (DM_VERSION == 514 && DM_BUILD == 1589)
#warn Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
#warn Please consider using 514.1588.


#if (DM_VERSION == 514 && DM_BUILD == 1590)
#error Warning! Byond 514.1590 has been known to be unstable. Use at your own risk.
#error Please consider using 514.1589.

#endif

// Keep savefile compatibilty at minimum supported level
Expand Down
51 changes: 42 additions & 9 deletions code/game/machinery/shuttle/shuttle_engine_types.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@
desc = "A thruster that burns plasma from an adjacent heater to create thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/plasma
fuel_type = GAS_PLASMA
fuel_use = 20
thrust = 25
fuel_use = 30
thrust = 12

/obj/machinery/power/shuttle/engine/fueled/expulsion
name = "expulsion thruster"
desc = "A thruster that expels gas inefficiently to create thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/expulsion
fuel_use = 80
thrust = 15
fuel_use = 90
thrust = 8
//All fuel code already handled

/**
Expand All @@ -113,20 +113,53 @@
icon_state_off = "burst_off"
icon_state_closed = "burst"
icon_state_open = "burst_open"
thrust = 1.5
thrust = 0.8
///Amount, in kilojoules, needed for a full burn.
var/power_per_burn = 85000
var/power_per_burn = 25000

/obj/machinery/power/shuttle/engine/electric/tech1
name = "1-st ion thruster"
desc = "A thruster that expels charged particles to generate thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech1
icon_state = "tech1"
icon_state_off = "tech1_off"
icon_state_closed = "tech1"
icon_state_open = "tech1_open"
thrust = 2
power_per_burn = 35000

/obj/machinery/power/shuttle/engine/electric/tech2
name = "2-st ion thruster"
desc = "A thruster that expels charged particles to generate thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech2
icon_state = "tech2"
icon_state_off = "tech2_off"
icon_state_closed = "tech2"
icon_state_open = "tech2_open"
thrust = 4
power_per_burn = 50000

/obj/machinery/power/shuttle/engine/electric/tech3
name = "3-st ion thruster"
desc = "A thruster that expels charged particles to generate thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech3
icon_state = "tech3"
icon_state_off = "tech3_off"
icon_state_closed = "tech3"
icon_state_open = "tech3_open"
thrust = 6
power_per_burn = 65000

/obj/machinery/power/shuttle/engine/electric/bad
name = "Outdated Ion Thruster"
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/bad
thrust = 2
power_per_burn = 70000
thrust = 0.5
power_per_burn = 50000

/obj/machinery/power/shuttle/engine/electric/premium
name = "high performance ion thruster"
desc = "An expensive variant of a standard ion thruster, using highest quality components in order to achieve much better performance."
thrust = 30
thrust = 3
power_per_burn = 65000

/obj/machinery/power/smes/shuttle
Expand Down
18 changes: 18 additions & 0 deletions code/game/objects/items/circuitboards/machine_circuitboards.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1454,6 +1454,24 @@
req_components = list(/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/micro_laser = 2)

/obj/item/circuitboard/machine/shuttle/engine/electric/tech1
name = "1st Ion Thruster (Machine Board)"
build_path = /obj/machinery/power/shuttle/engine/electric/tech1
req_components = list(/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/micro_laser = 2)

/obj/item/circuitboard/machine/shuttle/engine/electric/tech2
name = "2st Ion Thruster (Machine Board)"
build_path = /obj/machinery/power/shuttle/engine/electric/tech2
req_components = list(/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/micro_laser = 2)

/obj/item/circuitboard/machine/shuttle/engine/electric/tech3
name = "3st Ion Thruster (Machine Board)"
build_path = /obj/machinery/power/shuttle/engine/electric/tech3
req_components = list(/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/micro_laser = 2)

/obj/item/circuitboard/machine/shuttle/engine/expulsion
name = "Expulsion Thruster (Machine Board)"
build_path = /obj/machinery/power/shuttle/engine/fueled/expulsion
Expand Down
37 changes: 19 additions & 18 deletions code/modules/admin/chat_commands.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

/datum/tgs_chat_command/restart
name = "restart"
help_text = "Restarts the server if there are no active admins on."
help_text = "Перезапустит сервер при отсутствии администрации на нём."
admin_only = TRUE

/datum/tgs_chat_command/restart/Run(datum/tgs_chat_user/sender, params)
var/active_admins = FALSE
Expand All @@ -12,20 +13,20 @@
break
if(!active_admins)
SSticker.Reboot("Restart requested from the discord.", "discord")
return "Rebooting..."
return "Запущен перезапуск..."
else
return "There are active admins on the server! Ask them to restart."
return "На данный момент имеются активные администраторы на сервере! Перезапуск через Discord невозможен!"

/datum/tgs_chat_command/join
name = "join"
help_text = "Sends a join link."
help_text = "Покажет ссылку для подключения к игре."

/datum/tgs_chat_command/join/Run(datum/tgs_chat_user/sender, params)
return "<[world.internet_address]:[world.port]>"

/datum/tgs_chat_command/tgsstatus
name = "status"
help_text = "Gets the admincount, playercount, gamemode, and true game mode of the server"
help_text = "Покажет список администраторов, количество игроков и игровой режим."
admin_only = TRUE
var/last_tgs_status = 0

Expand All @@ -36,16 +37,16 @@
last_tgs_status = rtod
var/list/adm = get_admin_counts()
var/list/allmins = adm["total"]
var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). "
status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode ? SSticker.mode.name : "Not started"]."
var/status = "Администраторы: [allmins.len] (Активные: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Скрытые: [english_list(adm["stealth"])] Пропущенные: [english_list(adm["noflags"])]). "
status += "Игроки: [GLOB.clients.len] (Активные: [get_active_player_count(0,1,0)]). Режим: [SSticker.mode ? SSticker.mode.name : "Не запущен."]."
for(var/c in GLOB.clients)
var/client/C = c
status += "\n[C.key]"
return status

/datum/tgs_chat_command/tgscheck
name = "check"
help_text = "Gets the playercount, gamemode, and address of the server"
help_text = "Показывает количество игроков, игровой режим и ссылку для доступа к игре."
var/last_tgs_check = 0

/datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
Expand All @@ -54,7 +55,7 @@
return
last_tgs_check = rtod
var/server = CONFIG_GET(string/server)
return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players, Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]"
return "[GLOB.round_id ? "Раунд #[GLOB.round_id]: " : ""][GLOB.clients.len] игроков, Игровой режим: [GLOB.master_mode]; Раунд [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]"

/datum/tgs_chat_command/ahelp
name = "ahelp"
Expand All @@ -64,7 +65,7 @@
/datum/tgs_chat_command/ahelp/Run(datum/tgs_chat_user/sender, params)
var/list/all_params = splittext(params, " ")
if(all_params.len < 2)
return "Insufficient parameters"
return "Неверные параметры."
var/target = all_params[1]
all_params.Cut(1, 2)
var/id = text2num(target)
Expand All @@ -73,14 +74,14 @@
if(AH)
target = AH.initiator_ckey
else
return "Ticket #[id] not found!"
return "Тикет #[id] не найден!"
var/res = TgsPm(target, all_params.Join(" "), sender.friendly_name)
if(res != "Message Successful")
return res

/datum/tgs_chat_command/namecheck
name = "namecheck"
help_text = "Returns info on the specified target"
help_text = "Показывает информацию по игроку с указанным активным игроком."
admin_only = TRUE

/datum/tgs_chat_command/namecheck/Run(datum/tgs_chat_user/sender, params)
Expand All @@ -93,7 +94,7 @@

/datum/tgs_chat_command/adminwho
name = "adminwho"
help_text = "Lists administrators currently on the server"
help_text = "Покажет список администрации на сервере."
admin_only = TRUE

/datum/tgs_chat_command/adminwho/Run(datum/tgs_chat_user/sender, params)
Expand All @@ -103,14 +104,14 @@ GLOBAL_LIST(round_end_notifiees)

/datum/tgs_chat_command/endnotify
name = "endnotify"
help_text = "Pings the invoker when the round ends"
help_text = "Оповестит об окончании раунда."
admin_only = TRUE

/datum/tgs_chat_command/endnotify/Run(datum/tgs_chat_user/sender, params)
if(!SSticker.IsRoundInProgress() && SSticker.HasRoundStarted())
return "[sender.mention], the round has already ended!"
return "[sender.mention], раунд уже закончился!"
LAZYSET(GLOB.round_end_notifiees, sender.mention, TRUE)
return "I will notify [sender.mention] when the round ends."
return "Я дам знать, [sender.mention], когда закончится раунд."

/datum/tgs_chat_command/sdql
name = "sdql"
Expand All @@ -131,13 +132,13 @@ GLOBAL_LIST(round_end_notifiees)

/datum/tgs_chat_command/reload_admins
name = "reload_admins"
help_text = "Forces the server to reload admins."
help_text = "Принудительно перезагрузит администраторов на сервере."
admin_only = TRUE

/datum/tgs_chat_command/reload_admins/Run(datum/tgs_chat_user/sender, params)
ReloadAsync()
log_admin("[sender.friendly_name] reloaded admins via chat command.")
return "Admins reloaded."
return "Администраторы перезагружены."

/datum/tgs_chat_command/reload_admins/proc/ReloadAsync()
set waitfor = FALSE
Expand Down
27 changes: 27 additions & 0 deletions code/modules/research/designs/machine_designs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,33 @@
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

/datum/design/board/shuttle/engine/electric/tech1
name = "Machine Design (Ion Thruster Board) 1st generation"
desc = "The circuit board for an 1st generation ion thruster."
id = "engine_ion_t1"
materials = list(/datum/material/glass = 1000, /datum/material/silver = 2000, /datum/material/bluespace = 1000)
build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech1
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

/datum/design/board/shuttle/engine/electric/tech2
name = "Machine Design (Ion Thruster Board) 2nd generation"
desc = "The circuit board for an 2nd generation ion thruster."
id = "engine_ion_t2"
materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000, /datum/material/silver = 2000)
build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech2
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

/datum/design/board/shuttle/engine/electric/tech3
name = "Machine Design (Ion Thruster Board) 3nd generation"
desc = "The circuit board for an 3nd generation ion thruster."
id = "engine_ion_t3"
materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000, /datum/material/silver = 2000,/datum/material/diamond = 1500)
build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech3
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

/datum/design/board/shuttle/engine/expulsion
name = "Machine Design (Expulsion Thruster Board)"
desc = "The circuit board for an expulsion thruster."
Expand Down
Loading

0 comments on commit 89925fc

Please sign in to comment.