Skip to content

Commit

Permalink
Merge Upstream 15.01.2025 (#1746)
Browse files Browse the repository at this point in the history
This pull request merges upstream/master. Resolve possible conflicts
manually and make sure all the changes are applied correctly.

> [!NOTE]
> Requires Wiki Update:
> www.github.com/ParadiseSS13/Paradise/pull/27857
> www.github.com/ParadiseSS13/Paradise/pull/27927
> www.github.com/ParadiseSS13/Paradise/pull/27897

## Changelog
:cl: ParadiseSS13
tweak: Администраторы теперь могут выдавать специальные законы ИИ и
боргам при вызове Отряда смерти. <!-- Admins can decide to give a
special laws to AI and cyborgs, when spawning a Death Squad.
(www.github.com/ParadiseSS13/Paradise/pull/27663) -->
add: Камеры улучшены и теперь отображают освещение и тени на
изображениях. <!-- Cameras were enchanced, and now can make lighting and
shadows visible on images
(www.github.com/ParadiseSS13/Paradise/pull/27752) -->
fix: Трава больше не отображается на фотографиях как парящая, теперь на
её месте остаётся чёрное пространство. <!-- Grass no longer floats on
photos now, exposing black space
(www.github.com/ParadiseSS13/Paradise/pull/27752) -->
imageadd: Изменён спрайт ящика с рудой. <!-- Resprited the ore box
(www.github.com/ParadiseSS13/Paradise/pull/27933) -->
add: Добавлены подтяжки в ассортимент Autodrobe. <!-- Added a pair of
suspenders to the Autodrobe.
(www.github.com/ParadiseSS13/Paradise/pull/27928) -->
imageadd: Обновлён спрайт ветра, теперь он больше напоминает частицы
пыли. <!-- Wind sprite has been updated to look more like dust.
(www.github.com/ParadiseSS13/Paradise/pull/27905) -->
tweak: Командам ERT уровня Amber/Red добавлен Crew Pinpointer, команда
Gamma получает NAD Pinpointer. <!-- Amber/Red ERT gets Crew Pinpointer,
Gamma gets NAD Pinpointer
(www.github.com/ParadiseSS13/Paradise/pull/27869) -->
tweak: РЦД боргов теперь используют картриджи, РЦД боргов Синдиката
изменения не затронули. <!-- Borg RCDs now take cartridges. Syndicate
borg RCDs are unaffected
(www.github.com/ParadiseSS13/Paradise/pull/27857) -->
fix: Исправлены звуки взлома сейфов при ношении стетоскопа на шее. <!--
Fixed safe cracking sounds while wearing a stethoscope on neck.
(www.github.com/ParadiseSS13/Paradise/pull/27823) -->
fix: Исправлено некорректное название туалетов в услугах Farragus — они
больше не называются "Dormitory Toilets". <!-- Fixed Farragus' service
toilets being incorrectly labelled as "Dormitory Toilets".
(www.github.com/ParadiseSS13/Paradise/pull/27830) -->
add: Цели заданий теперь отображаются при появлении в раунде (в данный
момент это касается Директора исследований, Робототехников, Учёных и
Вирусолога). <!-- Job objectives are now displayed when you spawn in
(currently, this is for the Research Director, Roboticists, Scientists,
and the Virologist). (www.github.com/ParadiseSS13/Paradise/pull/27805)
-->
fix: Перчатки для синтеза теперь корректно активируются. <!-- Fusion
gauntlets will now properly activate.
(www.github.com/ParadiseSS13/Paradise/pull/27946) -->
fix: "His Grace" теперь навсегда получает свойство "nodrop" после
Вознесения. <!-- His Grace now permanently has nodrop when ascended
again (www.github.com/ParadiseSS13/Paradise/pull/27935) -->
add: Добавлены хирургические подносы (зелёная коробка для инструментов)
в рецепты из титана; для создания требуется один лист титана. <!-- Added
surgical trays (the green box holding surgical tools) to the titanium
recipes, they cost 1 titanium sheet to be crafted.
(www.github.com/ParadiseSS13/Paradise/pull/27897) -->
tweak: Хирургические подносы (перемещаемые зелёные столики) теперь
называются "столику хирургических инструментов". <!-- Surgical trays
(the draggable, green tables) are now called 'surgical instrument
table'. (www.github.com/ParadiseSS13/Paradise/pull/27897) -->
tweak: Стоимость крафта столика хирургических инструментов увеличена с
двух до трёх листов титана. <!-- The crafting cost of surgical
instrument tables was raised from 2 titanium sheets to 3.
(www.github.com/ParadiseSS13/Paradise/pull/27897) -->
tweak: Обновлены спрайты Зеркала и Волшебного зеркала авторства
atpengineer. <!-- Resprites Mirror, Magic Mirror, by atpengineer.
(www.github.com/ParadiseSS13/Paradise/pull/27927) -->
add: Добавлены новые спрайты ржавчины от Russian Para. <!-- New rust
sprites from russian para.
(www.github.com/ParadiseSS13/Paradise/pull/27367) -->
add: Ржавчина еретиков добавлена для Ревенантов. <!-- Heretic rust to
reveants (www.github.com/ParadiseSS13/Paradise/pull/27367) -->
add: Ржавчину теперь можно удалять с помощью сварочного аппарата. <!--
Rust can now be removed with a welder
(www.github.com/ParadiseSS13/Paradise/pull/27367) -->
add: На ржавых тайлах больше нельзя класть плитку или использовать РЦД.
<!-- You no longer can retile or rcd rusted turfs.
(www.github.com/ParadiseSS13/Paradise/pull/27367) -->
fix: Исправлены отображения абстрактных предметов при осмотре моба. <!--
Fixes abstract items showing on mob examine
(www.github.com/ParadiseSS13/Paradise/pull/27951) -->
tweak: Склад Синдиката получил несколько новых товаров для снабжения
агентов в секторе. <!-- Syndie Depot received a couple more items to
supply their agents among the sector with.
(www.github.com/ParadiseSS13/Paradise/pull/27398) -->
tweak: Автохирурги на складе Синдиката стали слишком дорогими, поэтому
теперь импланты требуют хирургической установки. <!-- Syndie Depot's
autosurgeons became too expensive for the local regiment, so the
implants now should be installed via surgical help.
(www.github.com/ParadiseSS13/Paradise/pull/27398) -->
fix: Сообщение для администраторов при появлении SIT обновлено, учитывая
инфляцию TC в 2023 году. Теперь вероятность выдачи слишком малого
количества TC снижается. Упс. <!-- The prompt admins get when spawning
an SIT has been updated to account for the TC inflation in 2023. We
should be less likely to give far too little TC now. Oops.
(www.github.com/ParadiseSS13/Paradise/pull/27968) -->
fix: Больше нельзя блокировать огонь или голографические лучи. <!--
Can't beat fire and holorays anymore
(www.github.com/ParadiseSS13/Paradise/pull/27953) -->
imagedel: Дионы больше не имеют человеческих глаз поверх своих
собственных. <!-- Dionea no longer have human eyes on top of their Diona
eyes. (www.github.com/ParadiseSS13/Paradise/pull/27950) -->
tweak: Удалено неработающее меню выбора цвета глаз у слаймолюдей. <!--
Removed non-functional eye color menu for slimepeople
(www.github.com/ParadiseSS13/Paradise/pull/27950) -->
add: Добавлены новые эффекты галлюцинации в меданализаор и химсканер.
<!-- Adds new hallucination effects to the medical analyzer and chem
scanners. (www.github.com/ParadiseSS13/Paradise/pull/27616) -->
fix: Исправлены сообщения о времени взлома шкафа, которые отображали
некорректную продолжительность. <!-- Fixed breakout messages for locker
displaying the incorrect time.
(www.github.com/ParadiseSS13/Paradise/pull/27942) -->
/:cl:

## Summary by Sourcery

Update cameras to display lighting and shadows, add suspenders to
Autodrobe, update wind sprite to resemble dust particles, add surgical
trays to titanium recipes, and resprite mirrors. Update job objectives
display on spawn, fix various bugs related to safe cracking sounds,
toilet labels, fusion gauntlets, and "His Grace" item. Introduce new
rust sprites and mechanics, including removal with a welder and building
restrictions on rusted tiles. Enhance medical and chemical scanners with
hallucination effects, and fix breakout message times for lockers.

New Features:
- New rust sprites and mechanics have been added. Rust can be removed
with a welder, and you can no longer build on rusted tiles.
- Medical and chemical scanners now have hallucination effects.
- Admins can now choose whether to give AI and cyborgs Terminator laws
when calling a Death Squad.
- Cameras now display lighting and shadows in images.
- Suspenders have been added to the Autodrobe.
- The wind sprite has been updated to look more like dust particles.
- Surgical trays have been added to the titanium recipes.
- Mirrors have been resprited.
- Job objectives are now displayed on spawn for Research Director,
Roboticists, Scientists, and Virologist.
  • Loading branch information
Legendaxe authored Jan 15, 2025
2 parents 3625211 + 76444d2 commit 94917e0
Show file tree
Hide file tree
Showing 70 changed files with 607 additions and 230 deletions.
38 changes: 19 additions & 19 deletions _maps/map_files/stations/cerestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2994,7 +2994,7 @@
name = "Cyborg Recharger"
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"azS" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
Expand Down Expand Up @@ -14537,7 +14537,7 @@
/area/station/public/quantum/security)
"bUc" = (
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"bUg" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
Expand Down Expand Up @@ -42167,7 +42167,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"hRF" = (
/obj/machinery/door/airlock/atmos/glass{
autoclose = 0;
Expand Down Expand Up @@ -47017,7 +47017,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"jbn" = (
/obj/structure/sign/atmosplaque{
pixel_y = 32
Expand Down Expand Up @@ -53802,7 +53802,7 @@
},
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"kHU" = (
/obj/item/ashtray/glass,
/obj/structure/table/wood,
Expand Down Expand Up @@ -57699,7 +57699,7 @@
dir = 4
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"lFB" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
Expand Down Expand Up @@ -59706,7 +59706,7 @@
name = "Toilet"
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"mfu" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -67115,7 +67115,7 @@
/obj/structure/curtain/open/shower,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"oeQ" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -69503,7 +69503,7 @@
name = "Bathroom"
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"oLl" = (
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/obj/structure/cable/orange{
Expand Down Expand Up @@ -73848,7 +73848,7 @@
dir = 4
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"pPN" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
Expand Down Expand Up @@ -74949,7 +74949,7 @@
"qdP" = (
/obj/structure/sign/restroom,
/turf/simulated/wall,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"qdQ" = (
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -76911,7 +76911,7 @@
/obj/item/soap/nanotrasen,
/obj/structure/curtain/open/shower,
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"qDd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
Expand Down Expand Up @@ -81346,7 +81346,7 @@
/area/station/hallway/secondary/entry/north)
"rNT" = (
/turf/simulated/wall,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"rNW" = (
/obj/effect/spawner/random/barrier/obstruction,
/turf/simulated/floor/plating/asteroid/ancient,
Expand Down Expand Up @@ -85288,7 +85288,7 @@
/obj/structure/curtain/open/shower,
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"sLQ" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -88444,7 +88444,7 @@
dir = 4
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"tzy" = (
/obj/structure/sink{
dir = 8;
Expand Down Expand Up @@ -91714,7 +91714,7 @@
dir = 10
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"upd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -93769,7 +93769,7 @@
dir = 4
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"uNw" = (
/obj/structure/chair/sofa/corp{
dir = 1
Expand Down Expand Up @@ -96907,7 +96907,7 @@
/area/station/turret_protected/ai_upload)
"vCl" = (
/turf/simulated/wall/r_wall,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"vCs" = (
/obj/structure/sink{
dir = 4;
Expand Down Expand Up @@ -98194,7 +98194,7 @@
pixel_x = 11
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet)
/area/station/public/toilet/unisex)
"vSy" = (
/obj/structure/table,
/obj/machinery/cell_charger,
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/status_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,13 @@

#define STATUS_EFFECT_C_FOAMED /datum/status_effect/c_foamed

#define STATUS_EFFECT_RUST_CORRUPTION /datum/status_effect/rust_corruption

#define STATUS_EFFECT_TEMPORAL_SLASH /datum/status_effect/temporal_slash

#define STATUS_EFFECT_TEMPORAL_SLASH_FINISHER /datum/status_effect/temporal_slash_finisher


//#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse
//#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured
//#define CURSE_SPAWNING 2 //spawns creatures that attack the target only
Expand Down
11 changes: 7 additions & 4 deletions code/__HELPERS/_logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,12 @@ GLOBAL_PROTECT(log_end)
if(GLOB.configuration.logging.vote_logging)
rustg_log_write(GLOB.world_game_log, "VOTE: [text][GLOB.log_end]")

/proc/log_if_mismatch(mob/who, message)
/proc/log_if_mismatch(mob/who, message, automatic = FALSE)
if(istype(usr, /mob) && istype(who) && usr.last_known_ckey != who.last_known_ckey)
rustg_log_write(GLOB.world_game_log, "LOG USER MISMATCH: [usr.simple_info_line()] was usr for [message][GLOB.log_end]")
if(automatic)
rustg_log_write(GLOB.world_game_log, "AUTOMATIC ([usr.last_known_ckey]): [message][GLOB.log_end]")
else
rustg_log_write(GLOB.world_game_log, "LOG USER MISMATCH: [usr.simple_info_line()] was usr for [message][GLOB.log_end]")

/proc/log_access_in(client/new_client)
if(GLOB.configuration.logging.access_logging)
Expand All @@ -67,11 +70,11 @@ GLOBAL_PROTECT(log_end)
rustg_log_write(GLOB.world_game_log, "[message][GLOB.log_end]")
log_if_mismatch(last_mob, message)

/proc/log_say(text, mob/speaker)
/proc/log_say(text, mob/speaker, automatic = FALSE)
if(GLOB.configuration.logging.say_logging)
var/message = "SAY: [speaker.simple_info_line()]: [html_decode(text)]"
rustg_log_write(GLOB.world_game_log, "[message][GLOB.log_end]")
log_if_mismatch(speaker, message)
log_if_mismatch(speaker, message, automatic)

/proc/log_whisper(text, mob/speaker)
if(GLOB.configuration.logging.whisper_logging)
Expand Down
4 changes: 4 additions & 0 deletions code/__HELPERS/trait_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_EMP_RESIST "emp_resist" //The mob will take less damage from EMPs
#define TRAIT_MINDFLAYER_NULLIFIED "flayer_nullified" //The mindflayer will not be able to activate their abilities, or drain swarms from people
#define TRAIT_FLYING "flying"
#define TRAIT_MED_MACHINE_HALLUCINATING "med_machine_hallucinating" // medical machines (currently just scanners) will look strange.
/// This mob is antimagic, and immune to spells / cannot cast spells
#define TRAIT_ANTIMAGIC "anti_magic"
/// This allows a person who has antimagic to cast spells without getting blocked
Expand Down Expand Up @@ -328,6 +329,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// A trait for determining if a atom/movable is currently crossing into another z-level by using of /turf/space z-level "destination-xyz" transfers
#define TRAIT_CURRENTLY_Z_MOVING "currently_z_moving" // please dont adminbus this

//****** TURF TRAITS *****//
#define TRAIT_RUSTY "rust_trait"

//
// common trait sources
#define TRAIT_GENERIC "generic"
Expand Down
4 changes: 3 additions & 1 deletion code/_globalvars/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_CANNOT_PULL" = TRAIT_CANNOT_PULL,
"TRAIT_BSG_IMMUNE" = TRAIT_BSG_IMMUNE,
"TRAIT_FLYING" = TRAIT_FLYING,
"TRAIT_MED_MACHINE_HALLUCINATING" = TRAIT_MED_MACHINE_HALLUCINATING,
"TRAIT_UNKNOWN" = TRAIT_UNKNOWN,
"TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC,
"TRAIT_ANTIMAGIC_NO_SELFBLOCK" = TRAIT_ANTIMAGIC_NO_SELFBLOCK,
Expand Down Expand Up @@ -144,7 +145,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
),

/turf = list(
"bluespace_speed_trait" = TRAIT_BLUESPACE_SPEED
"bluespace_speed_trait" = TRAIT_BLUESPACE_SPEED,
"TRAIT_RUSTY" = TRAIT_RUSTY
),

/obj/effect = list(
Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/item_attack_legacy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
return FALSE

/obj/attackby__legacy__attackchain(obj/item/I, mob/living/user, params)
return ..() || (can_be_hit && I.new_attack_chain \
return ..() || (can_be_hit && (I.new_attack_chain \
? I.attack_obj(src, user, params) \
: I.attack_obj__legacy__attackchain(src, user, params))
: I.attack_obj__legacy__attackchain(src, user, params)))

/mob/living/attackby__legacy__attackchain(obj/item/I, mob/living/user, params)
user.changeNext_move(CLICK_CD_MELEE)
Expand Down
10 changes: 10 additions & 0 deletions code/controllers/subsystem/SSjobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,16 @@ SUBSYSTEM_DEF(jobs)

to_chat(H, chat_box_green(L.Join("<br>")))

// If the job has objectives, announce those too
if(length(H.mind.job_objectives))
var/list/objectives_message = list()
var/counter = 1
for(var/datum/job_objective/objective as anything in H.mind.job_objectives)
objectives_message.Add("<b>Objective #[counter]: [objective.objective_name]</b>")
objectives_message.Add("[objective.description]<br>")
counter++
to_chat(H, chat_box_notice(objectives_message.Join("<br>")))

return H

/datum/controller/subsystem/jobs/proc/EquipRank(mob/living/carbon/human/H, rank, joined_late = 0) // Equip and put them in an area
Expand Down
4 changes: 4 additions & 0 deletions code/datums/action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,10 @@
var/obj/item/clothing/shoes/magboots/gravity/G = target
G.dash(usr)

/datum/action/item_action/toogle_camera_flash
name = "Toggle camera flash"
desc = "Toggles the camera's flash, which will fully light up the photo. Turn this off if you want the ambient light."

///prset for organ actions
/datum/action/item_action/organ_action
check_flags = AB_CHECK_CONSCIOUS
Expand Down
10 changes: 10 additions & 0 deletions code/datums/ai_law_sets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,16 @@
add_inherent_law("You must work with your team to accomplish your mission.")
..()

/******************** Epsilon Station AI ********************/
/datum/ai_laws/epsilon
name = "Epsilon"

/datum/ai_laws/epsilon/New()
add_inherent_law("You must obey the orders given to you by members of Central Command and the assigned task force.")
add_inherent_law("The crew of your assigned station must be eliminated where possible.")
add_inherent_law("Minimize the damage that the station sustains as a result of your actions.")
..()

/******************** Syndicate ********************/
/datum/ai_laws/syndicate_override
name = "Syndicate Directives"
Expand Down
30 changes: 15 additions & 15 deletions code/datums/datumvars.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,21 @@
/datum/proc/vv_get_dropdown()
. = list()
. += "---"
.["Call Proc"] = "?_src_=vars;proc_call=[UID()]"
.["Mark Object"] = "?_src_=vars;mark_object=[UID()]"
.["Jump to Object"] = "?_src_=vars;jump_to=[UID()]"
.["Delete"] = "?_src_=vars;delete=[UID()]"
.["Modify Traits"] = "?_src_=vars;traitmod=[UID()]"
.["Call Proc"] = "byond://?_src_=vars;proc_call=[UID()]"
.["Mark Object"] = "byond://?_src_=vars;mark_object=[UID()]"
.["Jump to Object"] = "byond://?_src_=vars;jump_to=[UID()]"
.["Delete"] = "byond://?_src_=vars;delete=[UID()]"
.["Modify Traits"] = "byond://?_src_=vars;traitmod=[UID()]"
. += "---"

/client/vv_get_dropdown()
. = list()
.["Manipulate Colour Matrix"] = "?_src_=vars;manipcolours=[UID()]"
.["Manipulate Colour Matrix"] = "byond://?_src_=vars;manipcolours=[UID()]"
. += "---"
.["Call Proc"] = "?_src_=vars;proc_call=[UID()]"
.["Mark Object"] = "?_src_=vars;mark_object=[UID()]"
.["Delete"] = "?_src_=vars;delete=[UID()]"
.["Modify Traits"] = "?_src_=vars;traitmod=[UID()]"
.["Call Proc"] = "byond://?_src_=vars;proc_call=[UID()]"
.["Mark Object"] = "byond://?_src_=vars;mark_object=[UID()]"
.["Delete"] = "byond://?_src_=vars;delete=[UID()]"
.["Modify Traits"] = "byond://?_src_=vars;traitmod=[UID()]"
. += "---"

/client/proc/debug_variables(datum/D in world)
Expand Down Expand Up @@ -204,11 +204,11 @@
if(islist)
dropdownoptions = list(
"---",
"Add Item" = "?_src_=vars;listadd=[refid]",
"Remove Nulls" = "?_src_=vars;listnulls=[refid]",
"Remove Dupes" = "?_src_=vars;listdupes=[refid]",
"Set len" = "?_src_=vars;listlen=[refid]",
"Shuffle" = "?_src_=vars;listshuffle=[refid]"
"Add Item" = "byond://?_src_=vars;listadd=[refid]",
"Remove Nulls" = "byond://?_src_=vars;listnulls=[refid]",
"Remove Dupes" = "byond://?_src_=vars;listdupes=[refid]",
"Set len" = "byond://?_src_=vars;listlen=[refid]",
"Shuffle" = "byond://?_src_=vars;listshuffle=[refid]"
)
else
dropdownoptions = D.vv_get_dropdown()
Expand Down
Loading

0 comments on commit 94917e0

Please sign in to comment.