cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 18:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove killbot ref. when you make an ED-209, reversed list order for QM requests and orders.

Browse Source
This commit is contained in:
SkyMarshal
2011-12-08 15:08:03 -07:00
parent b5018a8aa3
commit 3319b22adf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/bots/ed209bot.dm
View File

@@ -828,7 +828,7 @@ Auto Patrol: []"},
else if(istype(W, /obj/item/weapon/cable_coil) && (src.build_step == 6) )
var/obj/item/weapon/cable_coil/coil = W
var/turf/T = get_turf(user)
user.visible_message("[user] wires killbot.", "You start to wire the killbot.")
user.visible_message("[user] wires the ED-209 assembly.", "You start to wire the ED-209 assembly.")
sleep(40)
if(get_turf(user) == T)
coil.use(1)

8
code/game/supplyshuttle.dm
View File

@@ -312,14 +312,14 @@ var/ordernum=0
src.temp = "Current approved orders: <BR><BR>"
for(var/S in supply_shuttle_shoppinglist)
var/datum/supply_order/SO = S
src.temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]<BR>"
src.temp = "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]<BR>" + src.temp
src.temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
else if (href_list["viewrequests"])
src.temp = "Current requests: <BR><BR>"
for(var/S in supply_shuttle_requestlist)
var/datum/supply_order/SO = S
src.temp += "[SO.object.name] requested by [SO.orderedby]<BR>"
src.temp = "[SO.object.name] requested by [SO.orderedby]<BR>" + src.temp
src.temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
else if (href_list["mainmenu"])
@@ -483,7 +483,7 @@ var/ordernum=0
src.temp = "Current approved orders: <BR><BR>"
for(var/S in supply_shuttle_shoppinglist)
var/datum/supply_order/SO = S
src.temp += "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]<BR>"// <A href='?src=\ref[src];cancelorder=[S]'>(Cancel)</A><BR>"
src.temp = "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]<BR>" + src.temp// <A href='?src=\ref[src];cancelorder=[S]'>(Cancel)</A><BR>"
src.temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
/*
else if (href_list["cancelorder"])
@@ -501,7 +501,7 @@ var/ordernum=0
src.temp = "Current requests: <BR><BR>"
for(var/S in supply_shuttle_requestlist)
var/datum/supply_order/SO = S
src.temp += "[SO.object.name] requested by [SO.orderedby] [supply_shuttle_moving ? "":supply_shuttle_at_station ? "":"<A href='?src=\ref[src];doorder=\ref[SO]'>Approve</A> <A href='?src=\ref[src];rreq=\ref[SO]'>Remove</A>"]<BR>"
src.temp = "[SO.object.name] requested by [SO.orderedby] [supply_shuttle_moving ? "":supply_shuttle_at_station ? "":"<A href='?src=\ref[src];doorder=\ref[SO]'>Approve</A> <A href='?src=\ref[src];rreq=\ref[SO]'>Remove</A>"]<BR>" + src.temp
src.temp += "<BR><A href='?src=\ref[src];clearreq=1'>Clear list</A>"
src.temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"