mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
65e3fe7465
* asset cache cdn * Fix cdn rsc (#52886) I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0. * Add warning about https to the external rsc config (#53367) today in hostchat we discovered that most of the servers who tried to do cdn the .rsc, had unknown issues because they had used https:// urls. Byond can't into https. like 5 servers had failed to get this to work because of that pitfall, so im gonna add a warning to the config. * tchat * tgchat compile * fixes * Merge pull request #53011 from stylemistake/tgui-chat-fix-asay tgchat: Fix asay * chat color * logging * webstorage * compile TGUI * actually like compiles on the DM side * Update chat-dark.scss * Update chat-light.scss * Update resources.txt * Update tgui-panel.bundle.css * Colors * compile * s * s * Ports Gamers TGChat so we can edit it. - NOT LIVE TGCHAT BRANCH (#10226) * asset cache cdn * Fix cdn rsc (#52886) I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0. * Add warning about https to the external rsc config (#53367) today in hostchat we discovered that most of the servers who tried to do cdn the .rsc, had unknown issues because they had used https:// urls. Byond can't into https. like 5 servers had failed to get this to work because of that pitfall, so im gonna add a warning to the config. * tchat * tgchat compile * fixes * Merge pull request #53011 from stylemistake/tgui-chat-fix-asay tgchat: Fix asay * chat color * logging * webstorage * compile TGUI * actually like compiles on the DM side * Update chat-dark.scss * Update chat-light.scss * Update resources.txt * Update tgui-panel.bundle.css * Colors * compile * s * s Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com> Co-authored-by: Aleksej Komarov <stylemistake@gmail.com> Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com> Co-authored-by: TheSmallBlue <ilanmori@hotmail.com> * Fixes Replay Chat * Update to_chat.dm * Update chat.dm * Update demo.dm * yarn berry * yarn berry compile * Update resources.txt * Update config/resources.txt * Update resources.txt * Attempt at fixing reconnect. * Lets try fix it again * oops * THROW THE SINK AT IT * ree * Makes Travis work again thank you jamie * Fixes snowflake images * Update security.dm * Updates TGChat Test Merge (#10307) * asset cache cdn * Fix cdn rsc (#52886) I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0. * Add warning about https to the external rsc config (#53367) today in hostchat we discovered that most of the servers who tried to do cdn the .rsc, had unknown issues because they had used https:// urls. Byond can't into https. like 5 servers had failed to get this to work because of that pitfall, so im gonna add a warning to the config. * tchat * tgchat compile * fixes * Merge pull request #53011 from stylemistake/tgui-chat-fix-asay tgchat: Fix asay * chat color * logging * webstorage * compile TGUI * actually like compiles on the DM side * Update chat-dark.scss * Update chat-light.scss * Update resources.txt * Update tgui-panel.bundle.css * Colors * compile * s * s * Ports Gamers TGChat so we can edit it. - NOT LIVE TGCHAT BRANCH (#10226) * asset cache cdn * Fix cdn rsc (#52886) I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0. * Add warning about https to the external rsc config (#53367) today in hostchat we discovered that most of the servers who tried to do cdn the .rsc, had unknown issues because they had used https:// urls. Byond can't into https. like 5 servers had failed to get this to work because of that pitfall, so im gonna add a warning to the config. * tchat * tgchat compile * fixes * Merge pull request #53011 from stylemistake/tgui-chat-fix-asay tgchat: Fix asay * chat color * logging * webstorage * compile TGUI * actually like compiles on the DM side * Update chat-dark.scss * Update chat-light.scss * Update resources.txt * Update tgui-panel.bundle.css * Colors * compile * s * s Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com> Co-authored-by: Aleksej Komarov <stylemistake@gmail.com> Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com> Co-authored-by: TheSmallBlue <ilanmori@hotmail.com> * Fixes Replay Chat * Update to_chat.dm * Update chat.dm * Update demo.dm * yarn berry * yarn berry compile * Update resources.txt * Update config/resources.txt * Update resources.txt * Attempt at fixing reconnect. * Lets try fix it again * oops * THROW THE SINK AT IT * ree * Makes Travis work again thank you jamie * Fixes snowflake images * Update security.dm Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com> Co-authored-by: Aleksej Komarov <stylemistake@gmail.com> Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com> Co-authored-by: TheSmallBlue <ilanmori@hotmail.com> Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> * Fixes * Undo Kitchen Sink * Fucking 7 Hours. * status panel * stat panel fixes * fixes * stat panel stuff * Stat panel finish * Compile, oops * Update server_maint.dm * Update world.dm * Update interface.dm * tgui compile * Update subsystems.dm * fix statpanel deleting whole admin tab (#54211) fix: adminhelping no longer removes entire admin tab fix: end of round no longer removes entire admin tab * Update skin.dmf * verbs? Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com> Co-authored-by: Aleksej Komarov <stylemistake@gmail.com> Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com> Co-authored-by: TheSmallBlue <ilanmori@hotmail.com> Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> Co-authored-by: Couls <coul422@gmail.com> Co-authored-by: Tad Hardesty <tad@platymuus.com> Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
295 lines
11 KiB
Plaintext
295 lines
11 KiB
Plaintext
/proc/reagentsforbeakers()
|
|
. = list()
|
|
for(var/t in subtypesof(/datum/reagent))
|
|
var/datum/reagent/R = t
|
|
. += list(list("id" = t, "text" = initial(R.name)))
|
|
|
|
. = json_encode(.)
|
|
|
|
/proc/beakersforbeakers()
|
|
. = list()
|
|
for(var/t in subtypesof(/obj/item/reagent_containers))
|
|
var/obj/item/reagent_containers/C = t
|
|
. += list(list("id" = t, "text" = initial(C.name), "volume" = initial(C.volume)))
|
|
|
|
. = json_encode(.)
|
|
|
|
/datum/admins/proc/beaker_panel_act(list/href_list)
|
|
switch (href_list["beakerpanel"])
|
|
if ("spawncontainer")
|
|
var/containerdata = json_decode(href_list["container"])
|
|
var/obj/item/reagent_containers/container = beaker_panel_create_container(containerdata, get_turf(usr))
|
|
log_game("[key_name(usr)] spawned a [container] containing [pretty_string_from_reagent_list(container.reagents.reagent_list)]")
|
|
if ("spawngrenade")
|
|
var/obj/item/grenade/chem_grenade/grenade = new(get_turf(usr))
|
|
var/containersdata = json_decode(href_list["containers"])
|
|
var/reagent_string
|
|
for (var/i in 1 to 2)
|
|
grenade.beakers += beaker_panel_create_container(containersdata[i], grenade)
|
|
reagent_string += " ([grenade.beakers[i].name] [i] : " + pretty_string_from_reagent_list(grenade.beakers[i].reagents.reagent_list) + ");"
|
|
grenade.stage_change(GRENADE_READY)
|
|
var/grenadedata = json_decode(href_list["grenadedata"])
|
|
switch (href_list["grenadetype"])
|
|
if ("normal") // Regular cable coil-timed grenade
|
|
var/det_time = text2num(grenadedata["grenade-timer"])
|
|
if (det_time)
|
|
grenade.det_time = det_time
|
|
log_game("[key_name(usr)] spawned a [grenade] containing: [reagent_string]")
|
|
|
|
/datum/admins/proc/beaker_panel_prep_assembly(obj/item/assembly/towrap, grenade)
|
|
var/obj/item/assembly/igniter/igniter = new
|
|
igniter.secured = FALSE
|
|
var/obj/item/assembly_holder/assholder = new(grenade)
|
|
towrap.forceMove(assholder)
|
|
igniter.forceMove(assholder)
|
|
assholder.assemble(igniter, towrap, usr)
|
|
assholder.master = grenade
|
|
return assholder
|
|
|
|
/datum/admins/proc/beaker_panel_create_container(list/containerdata, location)
|
|
var/containertype = text2path(containerdata["container"])
|
|
var/obj/item/reagent_containers/container = new containertype(location)
|
|
var/datum/reagents/reagents = container.reagents
|
|
for(var/datum/reagent/R in reagents.reagent_list) // clear the container of reagents
|
|
reagents.remove_reagent(R.type,R.volume)
|
|
for (var/list/item in containerdata["reagents"])
|
|
var/datum/reagent/reagenttype = text2path(item["reagent"])
|
|
var/amount = text2num(item["volume"])
|
|
if ((reagents.total_volume + amount) > reagents.maximum_volume)
|
|
reagents.maximum_volume = reagents.total_volume + amount
|
|
reagents.add_reagent(reagenttype, amount)
|
|
return container
|
|
|
|
/datum/admins/proc/beaker_panel()
|
|
set category = "Admin.Fun"
|
|
set name = "Spawn reagent container"
|
|
if(!check_rights())
|
|
return
|
|
var/datum/asset/asset_datum = get_asset_datum(/datum/asset/simple/namespaced/common)
|
|
asset_datum.send()
|
|
//Could somebody tell me why this isn't using the browser datum, given that it copypastes all of browser datum's html
|
|
var/dat = {"
|
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
|
|
<html>
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="text/html">
|
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
<meta charset='UTF-8'>
|
|
<link rel='stylesheet' type='text/css' href='[SSassets.transport.get_asset_url("common.css")]'>
|
|
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
|
|
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/js/select2.full.min.js"></script>
|
|
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/css/select2.min.css">
|
|
<script type="text/javascript" src="https://kit.fontawesome.com/8d67455b41.js"></script>
|
|
<style>
|
|
.select2-search { color: #40628a; background-color: #272727; }
|
|
.select2-results { color: #40628a; background-color: #272727; }
|
|
.select2-selection { border-radius: 0px !important; }
|
|
ul {
|
|
list-style-type: none; /* Remove bullets */
|
|
padding: 0; /* Remove padding */
|
|
margin: 0; /* Remove margins */
|
|
}
|
|
ul li {
|
|
margin-top: -1px; /* Prevent double borders */
|
|
padding: 12px; /* Add some padding */
|
|
color: #ffffff;
|
|
text-decoration: none;
|
|
background: #40628a;
|
|
border: 1px solid #161616;
|
|
margin: 0 2px 0 0;
|
|
cursor:default;
|
|
}
|
|
.remove-reagent {
|
|
background-color: #d03000;
|
|
}
|
|
.container-control {
|
|
width: 48%;
|
|
float: left;
|
|
padding-right: 10px;
|
|
}
|
|
.reagent > div, .reagent-div {
|
|
float: right;
|
|
width: 200px;
|
|
}
|
|
input.reagent {
|
|
width: 50%;
|
|
}
|
|
.grenade-data {
|
|
display: inline-block;
|
|
}
|
|
</style>
|
|
<script>
|
|
window.onload=function(){
|
|
var reagents = [reagentsforbeakers()];
|
|
var containers = [beakersforbeakers()];
|
|
$('select\[name="containertype"\]').select2({
|
|
data: containers,
|
|
escapeMarkup: noEscape,
|
|
templateResult: formatContainer,
|
|
templateSelection: textSelection,
|
|
width: "300px"
|
|
});
|
|
$('.select-new-reagent').select2({
|
|
data: reagents,
|
|
escapeMarkup: noEscape,
|
|
templateResult: formatReagent,
|
|
templateSelection: textSelection
|
|
});
|
|
$('.remove-reagent').click(function() { $(this).parents('li').remove(); });
|
|
$('#spawn-grenade').click(function() {
|
|
var containers = $('div.container-control').map(function() {
|
|
var type = $(this).children('select\[name=containertype\]').select2("data")\[0\].id;
|
|
var reagents = $(this).find("li.reagent").map(function() {
|
|
return { "reagent": $(this).data("type"), "volume": $(this).find('input').val()};
|
|
}).get();
|
|
return {"container": type, "reagents": reagents };
|
|
}).get();
|
|
var grenadeType = $('#grenade-type').val()
|
|
var grenadeData = {};
|
|
$('.grenade-data.'+grenadeType).find(':input').each(function() {
|
|
var ret = {};
|
|
grenadeData\[$(this).attr('name')\] = $(this).val();
|
|
});
|
|
$.ajax({
|
|
url: '',
|
|
data: {
|
|
"_src_": "holder",
|
|
"admin_token": "[RawHrefToken()]",
|
|
"beakerpanel": "spawngrenade",
|
|
"containers": JSON.stringify(containers),
|
|
"grenadetype": grenadeType,
|
|
"grenadedata": JSON.stringify(grenadeData)
|
|
}
|
|
});
|
|
});
|
|
$('.spawn-container').click(function() {
|
|
var container = $(this).parents('div.container-control')\[0\];
|
|
var type = $(container).children('select\[name=containertype\]').select2("data")\[0\].id;
|
|
var reagents = $(container).find("li.reagent").map(function() {
|
|
return { "reagent": $(this).data("type"), "volume": $(this).find('input').val()};
|
|
}).get();
|
|
$.ajax({
|
|
url: '',
|
|
data: {
|
|
"_src_": "holder",
|
|
"admin_token": "[RawHrefToken()]",
|
|
"beakerpanel": "spawncontainer",
|
|
"container": JSON.stringify({"container": type, "reagents": reagents }),
|
|
}
|
|
});
|
|
});
|
|
$('.add-reagent').click(function() {
|
|
var select = $(this).parents('li').children('select').select2("data")\[0\];
|
|
var amount = $(this).parent().children('input').val();
|
|
addReagent($(this).parents('ul'), select.id, select.text, amount)
|
|
})
|
|
$('.export-reagents').click(function() {
|
|
var container = $(this).parents('div.container-control')\[0\];
|
|
var ret = \[\];
|
|
var reagents = $(container).find("li.reagent").each(function() {
|
|
var reagentname = $(this).contents().filter(function(){ return this.nodeType == 3; })\[0\].nodeValue.toLowerCase().replace(/\\W/g, '');
|
|
ret.push(reagentname+"="+$(this).find('input').val());
|
|
});
|
|
prompt("Copy this value", ret.join(';'));
|
|
});
|
|
$('.import-reagents').click(function() {
|
|
var macro = prompt("Enter a chemistry macro", "");
|
|
var parts = macro.split(';');
|
|
var container = $(this).parents('div.container-control')\[0\];
|
|
var ul = $(container).find("ul");
|
|
$(parts).each(function() {
|
|
var reagentArr = this.split('=');
|
|
var thisReagent = $(reagents).filter(function() { return this.text.toLowerCase().replace(/\\W/g, '') == reagentArr\[0\] })\[0\];
|
|
addReagent(ul, thisReagent.id, thisReagent.text, reagentArr\[1\]);
|
|
});
|
|
});
|
|
$('#grenade-type').change(function() {
|
|
$('.grenade-data').hide();
|
|
$('.grenade-data.'+$(this).val()).show();
|
|
})
|
|
function addReagent(ul, reagentType, reagentName, amount)
|
|
{
|
|
$('<li class="reagent" data-type="'+reagentType+'">'+reagentName+'<div><input class="reagent" value="'+amount+'" /> <button class="remove-reagent"><i class="far fa-trash-alt"></i> Remove</button></div></li>').insertBefore($(ul).children('li').last());
|
|
$(ul).children('li').last().prev().find('button').click(function() { $(this).parents('li').remove(); });
|
|
}
|
|
function textSelection(selection)
|
|
{
|
|
return selection.text;
|
|
}
|
|
function noEscape(markup)
|
|
{
|
|
return markup;
|
|
}
|
|
function formatReagent(result)
|
|
{
|
|
return '<span>'+result.text+'</span><br/><span><small>'+result.id+'</small></span>';
|
|
}
|
|
function formatContainer(result)
|
|
{
|
|
return '<span>'+result.text+" ("+result.volume+'u)</span><br/><span><small>'+result.id+'</small></span>';
|
|
}
|
|
}
|
|
</script>
|
|
</head>
|
|
<body scroll=auto>
|
|
<div class='uiWrapper'>
|
|
<div class='uiTitleWrapper'><div class='uiTitle'><tt>Beaker panel</tt></div></div>
|
|
<div class='uiContent'>
|
|
<div class="width: 100%">
|
|
<button id="spawn-grenade">
|
|
<i class="fas fa-bomb"></i> Spawn grenade
|
|
</button>
|
|
<label for="grenade-type">Grenade type: </label>
|
|
<select id="grenade-type">
|
|
<option value="normal">Normal</option>
|
|
</select>
|
|
<div class="grenade-data normal">
|
|
</div>
|
|
<br />
|
|
<small>note: beakers recommended, other containers may have issues</small>
|
|
</div>
|
|
"}
|
|
for (var/i in 1 to 2 )
|
|
dat += {"
|
|
<div class="container-control">
|
|
<h4>
|
|
Container [i]:
|
|
</h4>
|
|
<br />
|
|
<label for="beaker[i]type">Container type</label>
|
|
<select name="containertype" id="beaker[i]type"></select>
|
|
<br />
|
|
<br />
|
|
<div>
|
|
<button class="spawn-container">
|
|
<i class="fas fa-cog"></i> Spawn
|
|
</button>
|
|
|
|
<button class="import-reagents">
|
|
<i class="fas fa-file-import"></i> Import
|
|
</button>
|
|
|
|
<button class="export-reagents">
|
|
<i class="fas fa-file-export"></i> Export
|
|
</button>
|
|
</div>
|
|
<ul>
|
|
<li>
|
|
<select class="select-new-reagent"></select><div class="reagent-div"><input style="width: 50%" type="text" name="newreagent" value="40" /> <button class="add-reagent">
|
|
<i class="fas fa-plus"></i> Add
|
|
</button>
|
|
</div>
|
|
</li>
|
|
</ul>
|
|
</div>
|
|
"}
|
|
|
|
dat += {"
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|
|
"}
|
|
|
|
usr << browse(dat, "window=beakerpanel;size=1100x720")
|