cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes Weapons (#7415)

Browse Source 
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mint.dm
+25 -25
View File
@@ -126,15 +126,15 @@
if (src.output)
processing = 1;
icon_state = "coinpress1"
var/obj/item/weapon/moneybag/M
var/obj/item/moneybag/M
switch(chosen)
if(DEFAULT_WALL_MATERIAL)
while(amt_iron > 0 && coinsToProduce > 0)
if (locate(/obj/item/weapon/moneybag,output.loc))
M = locate(/obj/item/weapon/moneybag,output.loc)
if (locate(/obj/item/moneybag,output.loc))
M = locate(/obj/item/moneybag,output.loc)
else
M = new/obj/item/weapon/moneybag(output.loc)
new/obj/item/weapon/coin/iron(M)
M = new/obj/item/moneybag(output.loc)
new/obj/item/coin/iron(M)
amt_iron -= 20
coinsToProduce--
newCoins++
@@ -142,11 +142,11 @@
sleep(5);
if("gold")
while(amt_gold > 0 && coinsToProduce > 0)
if (locate(/obj/item/weapon/moneybag,output.loc))
M = locate(/obj/item/weapon/moneybag,output.loc)
if (locate(/obj/item/moneybag,output.loc))
M = locate(/obj/item/moneybag,output.loc)
else
M = new/obj/item/weapon/moneybag(output.loc)
new /obj/item/weapon/coin/gold(M)
M = new/obj/item/moneybag(output.loc)
new /obj/item/coin/gold(M)
amt_gold -= 20
coinsToProduce--
newCoins++
@@ -154,11 +154,11 @@
sleep(5);
if("silver")
while(amt_silver > 0 && coinsToProduce > 0)
if (locate(/obj/item/weapon/moneybag,output.loc))
M = locate(/obj/item/weapon/moneybag,output.loc)
if (locate(/obj/item/moneybag,output.loc))
M = locate(/obj/item/moneybag,output.loc)
else
M = new/obj/item/weapon/moneybag(output.loc)
new /obj/item/weapon/coin/silver(M)
M = new/obj/item/moneybag(output.loc)
new /obj/item/coin/silver(M)
amt_silver -= 20
coinsToProduce--
newCoins++
@@ -166,11 +166,11 @@
sleep(5);
if("diamond")
while(amt_diamond > 0 && coinsToProduce > 0)
if (locate(/obj/item/weapon/moneybag,output.loc))
M = locate(/obj/item/weapon/moneybag,output.loc)
if (locate(/obj/item/moneybag,output.loc))
M = locate(/obj/item/moneybag,output.loc)
else
M = new/obj/item/weapon/moneybag(output.loc)
new /obj/item/weapon/coin/diamond(M)
M = new/obj/item/moneybag(output.loc)
new /obj/item/coin/diamond(M)
amt_diamond -= 20
coinsToProduce--
newCoins++
@@ -178,11 +178,11 @@
sleep(5);
if("phoron")
while(amt_phoron > 0 && coinsToProduce > 0)
if (locate(/obj/item/weapon/moneybag,output.loc))
M = locate(/obj/item/weapon/moneybag,output.loc)
if (locate(/obj/item/moneybag,output.loc))
M = locate(/obj/item/moneybag,output.loc)
else
M = new/obj/item/weapon/moneybag(output.loc)
new /obj/item/weapon/coin/phoron(M)
M = new/obj/item/moneybag(output.loc)
new /obj/item/coin/phoron(M)
amt_phoron -= 20
coinsToProduce--
newCoins++
@@ -190,11 +190,11 @@
sleep(5);
if("uranium")
while(amt_uranium > 0 && coinsToProduce > 0)
if (locate(/obj/item/weapon/moneybag,output.loc))
M = locate(/obj/item/weapon/moneybag,output.loc)
if (locate(/obj/item/moneybag,output.loc))
M = locate(/obj/item/moneybag,output.loc)
else
M = new/obj/item/weapon/moneybag(output.loc)
new /obj/item/weapon/coin/uranium(M)
M = new/obj/item/moneybag(output.loc)
new /obj/item/coin/uranium(M)
amt_uranium -= 20
coinsToProduce--
newCoins++