cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 00:26:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Ccomp5950
2014-01-23 00:19:01 -06:00
parent 23f4d34e4b c028db481e
commit 283df26fa7
22 changed files with 77 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/uplinks.dm
+6 -10
View File
@@ -27,6 +27,12 @@ A list of items and costs is stored under the datum of every game mode, alongsid
ItemList = text2list(src.items, ";") // Parsing the items text string
uses = ticker.mode.uplink_uses
nanoui_items = generate_nanoui_items()
for(var/D in ItemList)
var/list/O = text2list(D, ":")
if(O.len>0)
valid_items += O[1]
/*
Built the Items List for use with NanoUI
@@ -56,16 +62,6 @@ A list of items and costs is stored under the datum of every game mode, alongsid
return items_nano
//Halfassed fix for href exploit ~Z
for(var/D in ItemList)
var/list/O = text2list(D, ":")
if(O.len>0)
valid_items += O[1]
//Let's build a menu!
/obj/item/device/uplink/proc/generate_menu()
code/game/objects/structures/watercloset.dm
+3 -3
View File
@@ -153,7 +153,7 @@
if(I.type == /obj/item/device/analyzer)
user << "<span class='notice'>The water temperature seems to be [watertemp].</span>"
if(istype(I, /obj/item/weapon/wrench))
user << "<span class='notice'>You begin to adjust the temperature valve with the [I].</span>"
user << "<span class='notice'>You begin to adjust the temperature valve with \the [I].</span>"
if(do_after(user, 50))
switch(watertemp)
if("normal")
@@ -162,7 +162,7 @@
watertemp = "boiling"
if("boiling")
watertemp = "normal"
user.visible_message("<span class='notice'>[user] adjusts the shower with the [I].</span>", "<span class='notice'>You adjust the shower with the [I].</span>")
user.visible_message("<span class='notice'>[user] adjusts the shower with \the [I].</span>", "<span class='notice'>You adjust the shower with \the [I].</span>")
add_fingerprint(user)
/obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up
@@ -354,7 +354,7 @@
if (istype(O, /obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/RG = O
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
user.visible_message("\blue [user] fills the [RG] using \the [src].","\blue You fill the [RG] using \the [src].")
user.visible_message("\blue [user] fills \the [RG] using \the [src].","\blue You fill \the [RG] using \the [src].")
return
else if (istype(O, /obj/item/weapon/melee/baton))