cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nanotrasen capitalization (#39547)

Browse Source 
Corrects a couple instances of improper capitalization of Nanotrasen.
This commit is contained in:
ShizCalev
2018-08-04 17:57:49 -04:00
committed by yogstation13-bot
parent 99cc72bdc3
commit 2d8e558ac2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/cargo/expressconsole.dm
View File

@@ -9,7 +9,7 @@
/obj/machinery/computer/cargo/express /obj/machinery/computer/cargo/express
name = "express supply console" name = "express supply console"
desc = "This console allows the user to purchase a package \ desc = "This console allows the user to purchase a package \
with 1/40th of the delivery time: made possible by NanoTrasen's new \"1500mm Orbital Railgun\".\ with 1/40th of the delivery time: made possible by Nanotrasen's new \"1500mm Orbital Railgun\".\
All sales are near instantaneous - please choose carefully" All sales are near instantaneous - please choose carefully"
icon_screen = "supply_express" icon_screen = "supply_express"
circuit = /obj/item/circuitboard/computer/cargo/express circuit = /obj/item/circuitboard/computer/cargo/express
@@ -109,7 +109,7 @@
if(SSshuttle.supplyBlocked) if(SSshuttle.supplyBlocked)
message = blockade_warning message = blockade_warning
if(usingBeacon && !beacon) if(usingBeacon && !beacon)
message = "BEACON ERROR: BEACON MISSING"//beacon was destroyed message = "BEACON ERROR: BEACON MISSING"//beacon was destroyed
else if (usingBeacon && !canBeacon) else if (usingBeacon && !canBeacon)
message = "BEACON ERROR: MUST BE EXPOSED"//beacon's loc/user's loc must be a turf message = "BEACON ERROR: MUST BE EXPOSED"//beacon's loc/user's loc must be a turf
if(obj_flags & EMAGGED) if(obj_flags & EMAGGED)
@@ -165,7 +165,7 @@
var/LZ var/LZ
if (istype(beacon) && usingBeacon)//prioritize beacons over landing in cargobay if (istype(beacon) && usingBeacon)//prioritize beacons over landing in cargobay
LZ = get_turf(beacon) LZ = get_turf(beacon)
beacon.update_status(SP_LAUNCH) beacon.update_status(SP_LAUNCH)
else if (!usingBeacon)//find a suitable supplypod landing zone in cargobay else if (!usingBeacon)//find a suitable supplypod landing zone in cargobay
landingzone = locate(/area/quartermaster/storage) in GLOB.sortedAreas landingzone = locate(/area/quartermaster/storage) in GLOB.sortedAreas
if (!landingzone) if (!landingzone)
@@ -177,7 +177,7 @@
LAZYADD(empty_turfs, T) LAZYADD(empty_turfs, T)
CHECK_TICK CHECK_TICK
if(empty_turfs && empty_turfs.len) if(empty_turfs && empty_turfs.len)
LZ = pick(empty_turfs) LZ = pick(empty_turfs)
if (SO.pack.cost <= SSshuttle.points && LZ)//we need to call the cost check again because of the CHECK_TICK call if (SO.pack.cost <= SSshuttle.points && LZ)//we need to call the cost check again because of the CHECK_TICK call
SSshuttle.points -= SO.pack.cost SSshuttle.points -= SO.pack.cost
new /obj/effect/DPtarget(LZ, SO, podID) new /obj/effect/DPtarget(LZ, SO, podID)

2
tgui/assets/tgui.js
View File

File diff suppressed because one or more lines are too long

2
tgui/src/interfaces/rdconsole/rdheader.ract
View File

@@ -1,5 +1,5 @@
<ui-display> <ui-display>
<span class='memoedit'>NanoTrasen R&D Console</span><br/> <span class='memoedit'>Nanotrasen R&D Console</span><br/>
Available Points: <ui-section title='Research Points'>{{data.research_points_stored}}</ui-section> Available Points: <ui-section title='Research Points'>{{data.research_points_stored}}</ui-section>
<ui-section title='Page Selection - {{page}}'><input value={{pageselect}} placeholder='1' class="number"/> <ui-section title='Page Selection - {{page}}'><input value={{pageselect}} placeholder='1' class="number"/>
Select Page: <ui-button action='page' params='{"num" : "{{pageselect}}"}'> [Go] </ui-button> Select Page: <ui-button action='page' params='{"num" : "{{pageselect}}"}'> [Go] </ui-button>