cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull

Browse Source 
August2020UpstreamPull
This commit is contained in:
Razgriz
2020-08-09 02:58:18 -07:00
parent deecf5e4dc 9d3b96c8bd
commit f00fdebbb9
915 changed files with 253357 additions and 90809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mining/drilling/drill.dm
View File

@@ -59,12 +59,12 @@
default_apply_parts()
cell = default_use_hicell()
/obj/machinery/mining/drill/loaded
cell = /obj/item/weapon/cell/high
/obj/machinery/mining/drill/get_cell()
return cell
/obj/machinery/mining/drill/loaded
cell = /obj/item/weapon/cell/high
/obj/machinery/mining/drill/process()
if(need_player_check)
@@ -397,4 +397,4 @@
return 0
src.set_dir(turn(src.dir, 270))
return 1
return 1

158
code/modules/mining/reward_yw.dm
View File

@@ -1,158 +0,0 @@
/obj/machinery/miningreward
name = "Mining reward machine"
desc = "Feed coins, get something worth your time.. Ish..."
icon = 'icons/obj/machines/antimatter.dmi'
icon_state = "control"
anchored = 1
density = 1
use_power = 1
idle_power_usage = 10
active_power_usage = 10
var/totalmoney = 0
var/list/products = list(
/obj/item/device/binoculars,
/obj/item/weapon/pickaxe/silver,
/obj/item/weapon/pickaxe/drill,
/obj/item/weapon/pickaxe/jackhammer,
/obj/item/weapon/pickaxe/gold,
/obj/item/weapon/pickaxe/plasmacutter,
/obj/item/weapon/pickaxe/diamond,
/obj/item/weapon/pickaxe/diamonddrill,
/obj/vehicle/bike/,
/obj/vehicle/train/rover/engine,
/obj/vehicle/train/rover/trolley)
var/list/prices = list( /obj/item/device/binoculars = 200,
/obj/item/weapon/pickaxe/silver = 200,
/obj/item/weapon/pickaxe/drill = 240,
/obj/item/weapon/pickaxe/jackhammer = 300,
/obj/item/weapon/pickaxe/gold = 360,
/obj/item/weapon/pickaxe/plasmacutter = 460,
/obj/item/weapon/pickaxe/diamond = 500,
/obj/item/weapon/pickaxe/diamonddrill = 600,
/obj/vehicle/bike/ = 1500,
/obj/vehicle/train/rover/engine = 3000,
/obj/vehicle/train/rover/trolley = 200)
/obj/machinery/miningreward/New()
..()
/obj/machinery/miningreward/Destroy()//Perhaps damage and run stability checks rather than just qdel on the others
..()
/obj/machinery/miningreward/emp_act(severity)
..()
return 0
/obj/machinery/miningreward/bullet_act(var/obj/item/projectile/Proj)
return 0
/obj/machinery/miningreward/update_icon()
return
/obj/machinery/miningreward/attackby(obj/item/W, mob/user)
if(!istype(W) || !user) return
if(istype(W, /obj/item/weapon/wrench))
if(!anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures the [src.name] to the floor.", \
"You secure the anchor bolts to the floor.", \
"You hear a ratchet")
src.anchored = 1
else
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] unsecures the [src.name].", \
"You remove the anchor bolts.", \
"You hear a ratchet")
src.anchored = 0
return
if(istype(W, /obj/item/weapon/coin))
user.remove_from_mob(W)
W.loc = src
user.update_icons()
user.visible_message("[user.name] inserts a [W.name] into the [src.name].", \
"You insert a [W.name].", \
"You hear a thunk.")
if(istype(W, /obj/item/weapon/coin/iron))
totalmoney += 1
else if(istype(W, /obj/item/weapon/coin/phoron))
totalmoney += 2
else if(istype(W, /obj/item/weapon/coin/uranium))
totalmoney += 3
else if(istype(W, /obj/item/weapon/coin/platinum))
totalmoney += 4
else if(istype(W, /obj/item/weapon/coin/silver))
totalmoney += 5
else if(istype(W, /obj/item/weapon/coin/gold))
totalmoney += 10
else if(istype(W, /obj/item/weapon/coin/diamond))
totalmoney += 20
return
..()
return
/obj/machinery/miningreward/attack_hand(mob/user as mob)
if(anchored)
interact(user)
return
/obj/machinery/miningreward/interact(mob/user)
if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
if(!istype(user, /mob/living/silicon/ai))
user.unset_machine()
user << browse(null, "window=RWcontrol")
return
user.set_machine(src)
var/dat = ""
dat += "Mining Reward Panel<BR>"
dat += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
dat += "Points: [totalmoney] <BR>"
for(var/i=1;i<=products.len;++i)
var/product = products[i]
var/obj/P = new product()
dat += "<A href='?src=\ref[src];task=vend;id=[i]'>[P.name] - [(products[i] in prices) ? prices[products[i]] : 0]</A><BR>"
user << browse(dat, "window=RWcontrol;size=420x500")
onclose(user, "RWcontrol")
return
/obj/machinery/miningreward/Topic(href, href_list)
..()
//Ignore input if we are broken or guy is not touching us, AI can control from a ways away
if(stat & (BROKEN|NOPOWER) || (get_dist(src, usr) > 1 && !istype(usr, /mob/living/silicon/ai)))
usr.unset_machine()
usr << browse(null, "window=RWcontrol")
return
else if(href_list["close"])
usr << browse(null, "window=RWcontrol")
usr.unset_machine()
return
else if(href_list["task"] && href_list["task"] == "vend")
var/ID = text2num(href_list["id"])
var/product = products[ID]
if(products[product] != 0 && totalmoney >= prices[product])
totalmoney -= prices[product]
products[product]-=1
var/obj/prod = new product
prod.loc = src.loc
updateDialog()
return