Upgrade NOW to Space Parts & Space Vendors PLUS for full remote order control and inventory management."
if (49) //janitorial locator
- menu = "[PDAIMG(bucket)] Persistent Custodial Object Locator "
var/turf/cl = get_turf(src)
if (cl)
@@ -511,7 +510,7 @@ Code:
menu += "Refresh GPS Locator "
if (53) // Newscaster
- menu = "[PDAIMG(notes)] Newscaster Access "
menu += "[current_channel ? current_channel : "None"] Post Message "
if (54) // Beepsky, Medibot, Floorbot, and Cleanbot access
- menu = "[PDAIMG(medbot)] Bots Interlink "
bot_control()
if (99) //Newscaster message permission error
menu = " ERROR : NOT AUTHORIZED [host_pda.id ? "" : "- ID SLOT EMPTY"] "
@@ -652,7 +651,7 @@ Code:
var/mob/living/simple_animal/bot/Bot
if(active_bot)
- menu += "[active_bot] refresh [active_bot] [PDAIMG(refresh)]refresh )Summon Bot \][PDAIMG(back)]Return to bot list "
else
- menu += "[PDAIMG(refresh)]Scan for active bots Alt-click to fold it. ")
- var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/simple/paper)
assets.send(user)
if(in_range(user, src) || isobserver(user))
@@ -300,7 +300,10 @@
if(!in_range(src, user))
return
- stamps += "[stored_research.organization] Research and Development Network "
l += "Available points: [round(stored_research.research_points)] (+[round(stored_research.last_bitcoins * 60)] / minute)"
l += "Security protocols: [obj_flags & EMAGGED ? "Disabled " : "Enabled "]"
diff --git a/rust_g.dll b/rust_g.dll
index 4e1df5afbd..44e38ef0dd 100644
Binary files a/rust_g.dll and b/rust_g.dll differ
diff --git a/tgui/src/interfaces/rpd.ract b/tgui/src/interfaces/rpd.ract
index ba24bd75f0..318b56533f 100644
--- a/tgui/src/interfaces/rpd.ract
+++ b/tgui/src/interfaces/rpd.ract
@@ -1,11 +1,22 @@
-
+ {{#each data.preview_rows}}
+
+ {{#each previews}}
+
+ {{/each}}
+
+{{#if data.category == 0}}
+
+ {{#each data.paint_colors}}
+ {{@key}}
+ {{/each}}
+
{{/if}}
diff --git a/tools/travis/build_dependencies.sh b/tools/travis/build_dependencies.sh
index 8f5c8de10a..60a23d9723 100755
--- a/tools/travis/build_dependencies.sh
+++ b/tools/travis/build_dependencies.sh
@@ -6,9 +6,12 @@ if [ "$BUILD_TOOLS" = false ]; then
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-host i686-unknown-linux-gnu
source ~/.profile
- git clone --branch $RUST_G_VERSION https://github.com/tgstation/rust-g
-
+ mkdir rust-g
cd rust-g
+ git init
+ git remote add origin https://github.com/tgstation/rust-g
+ git fetch --depth 1 origin $RUST_G_VERSION
+ git checkout FETCH_HEAD
cargo build --release
mkdir -p ~/.byond/bin
Refresh
Eject [cartridge]"
+ dat += " | [PDAIMG(eject)]Eject [cartridge]"
if (mode)
- dat += " | 
Return"
+ dat += " | [PDAIMG(menu)]Return"
if (mode == 0)
dat += "
Notekeeper
Messenger
Honk Synthesizer
Set Status Display
Power Monitor
Medical Records
[scanmode == 1 ? "Disable" : "Enable"] Medical Scanner
Security Records
Supply Records
Bots Access
Custodial Locator
Signaler System
[scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner
Toggle Remote Door
Drone Phone
Atmospheric Scan
[fon ? "Disable" : "Enable"] Flashlight
Ringer: [silent == 1 ? "Off" : "On"] | "
- dat += "
Clear Messages"
+ dat += "
Return to bot list"
+ menu += "
"
+ var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/simple/paper)
+ if (isnull(stamps))
+ stamps = sheet.css_tag()
+ stamps += sheet.icon_tag(P.icon_state)
var/mutable_appearance/stampoverlay = mutable_appearance('icons/obj/bureaucracy.dmi', "paper_[P.icon_state]")
stampoverlay.pixel_x = rand(-2, 2)
stampoverlay.pixel_y = rand(-3, 2)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 1268b2be87..997d957a4e 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -51,8 +51,9 @@ other types of metals and chemistry for reagents).
return ..()
/datum/design/proc/icon_html(client/user)
- send_asset(user, "design_[id].png", FALSE)
- return "![](\"design_[id].png\")
"
+ var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
+ sheet.send(user)
+ return sheet.icon_tag(id)
////////////////////////////////////////
//Disks for transporting design datums//
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 6c85a16498..db08c9b950 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -217,6 +217,8 @@ doesn't have toxins access.
/obj/machinery/computer/rdconsole/proc/ui_header()
var/list/l = list()
+ var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
+ l += "[sheet.css_tag()][RDSCREEN_NOBREAK]"
l += "