cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

duffle bag fix, can now remove coins from it, small mining mapping fix to fix power, also fixed an area being slightly wrongly placed in escape arm. made the satchel spawn in the miners' hand instead of pocket.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1049 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2011-02-15 04:45:21 +00:00
parent 8931ec8b86
commit c77c307200
4 changed files with 6264 additions and 6220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/WorkInProgress/mining.dm
View File

@@ -2578,21 +2578,19 @@ proc/move_mining_shuttle()
var/dat = text("<b>The contents of the moneybag reveal...</b><br>")
if (amt_gold)
dat += text("Gold coins: [amt_gold]<br>")
dat += text("Gold coins: [amt_gold]<br> <A href='?src=\ref[src];remove=gold'>Remove one</A>")
if (amt_silver)
dat += text("Silver coins: [amt_silver]<br>")
dat += text("Silver coins: [amt_silver]<br> <A href='?src=\ref[src];remove=silver'>Remove one</A>")
if (amt_iron)
dat += text("Metal coins: [amt_iron]<br>")
dat += text("Metal coins: [amt_iron]<br> <A href='?src=\ref[src];remove=iron'>Remove one</A>")
if (amt_diamond)
dat += text("Diamond coins: [amt_diamond]<br>")
dat += text("Diamond coins: [amt_diamond]<br> <A href='?src=\ref[src];remove=diamond'>Remove one</A>")
if (amt_plasma)
dat += text("Plasma coins: [amt_plasma]<br>")
dat += text("Plasma coins: [amt_plasma]<br> <A href='?src=\ref[src];remove=plasma'>Remove one</A>")
if (amt_uranium)
dat += text("Uranium coins: [amt_uranium]<br>")
dat += text("Uranium coins: [amt_uranium]<br> <A href='?src=\ref[src];remove=uranium'>Remove one</A>")
if (amt_clown)
dat += text("Bananium coins: [amt_clown]<br>")
if (amt_clown)
dat += text("<br>Strangely you can only view the bag's contents. There is no way to remove them.")
dat += text("Bananium coins: [amt_clown]<br> <A href='?src=\ref[src];remove=clown'>Remove one</A>")
user << browse("[dat]", "window=moneybag")
/obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -2607,6 +2605,34 @@ proc/move_mining_shuttle()
user << "\blue You empty the [C.name] into the bag."
return
/obj/item/weapon/moneybag/Topic(href, href_list)
if(..())
return
usr.machine = src
src.add_fingerprint(usr)
if(href_list["remove"])
var/obj/item/weapon/coin/COIN
switch(href_list["remove"])
if("gold")
COIN = locate(/obj/item/weapon/coin/gold,src.contents)
if("silver")
COIN = locate(/obj/item/weapon/coin/silver,src.contents)
if("iron")
COIN = locate(/obj/item/weapon/coin/iron,src.contents)
if("diamond")
COIN = locate(/obj/item/weapon/coin/diamond,src.contents)
if("plasma")
COIN = locate(/obj/item/weapon/coin/plasma,src.contents)
if("uranium")
COIN = locate(/obj/item/weapon/coin/uranium,src.contents)
if("clown")
COIN = locate(/obj/item/weapon/coin/clown,src.contents)
if(!COIN)
return
COIN.loc = src.loc
return
/**********************Gas extractor**************************/
/obj/machinery/mineral/gasextractor

2
code/game/jobs/jobprocs.dm
View File

@@ -371,7 +371,7 @@
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
src.equip_if_possible(new /obj/item/weapon/crowbar(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/satchel(src), slot_r_store)
src.equip_if_possible(new /obj/item/weapon/satchel(src), slot_l_hand)
if ("Assistant")
src.equip_if_possible(new /obj/item/clothing/under/color/grey(src), slot_w_uniform)