cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 09:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)

Browse Source 
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj/weapon.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-04 22:23:50 +10:00
parent c4bd191222 66d28ab7e4
commit dc3f6f2239
26 changed files with 327 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Mini/ATM.dm
+9 -9
View File
@@ -21,7 +21,7 @@ log transactions
/obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob)
if(ishuman(user))
var/obj/item/weapon/card/id/user_id = src.scan_user(user)
if(istype(I,/obj/item/weapon/money))
if(istype(I,/obj/item/weapon/spacecash))
user_id.money += I:worth
del I
@@ -51,21 +51,21 @@ log transactions
//hueg switch for giving moneh out
switch(amount)
if(1)
new /obj/item/weapon/money(loc)
new /obj/item/weapon/spacecash(loc)
if(10)
new /obj/item/weapon/money/c10(loc)
new /obj/item/weapon/spacecash/c10(loc)
if(20)
new /obj/item/weapon/money/c20(loc)
new /obj/item/weapon/spacecash/c20(loc)
if(50)
new /obj/item/weapon/money/c50(loc)
new /obj/item/weapon/spacecash/c50(loc)
if(100)
new /obj/item/weapon/money/c100(loc)
new /obj/item/weapon/spacecash/c100(loc)
if(200)
new /obj/item/weapon/money/c200(loc)
new /obj/item/weapon/spacecash/c200(loc)
if(500)
new /obj/item/weapon/money/c500(loc)
new /obj/item/weapon/spacecash/c500(loc)
if(1000)
new /obj/item/weapon/money/c1000(loc)
new /obj/item/weapon/spacecash/c1000(loc)
else
usr << browse("You don't have that much money!<br/><a href=\"?src=\ref[src]\">Back</a>","window=atm")
return
code/WorkInProgress/Ported/policetape.dm
+19 -1
View File
@@ -1,3 +1,21 @@
//Define all tape types in policetape.dm
/obj/item/taperoll
name = "tape roll"
icon = 'policetape.dmi'
icon_state = "rollstart"
flags = FPRINT
w_class = 1.0
var/turf/start
var/turf/end
var/tape_type = /obj/item/tape
var/icon_base
/obj/item/tape
name = "tape"
icon = 'policetape.dmi'
anchored = 1
density = 1
var/icon_base
/obj/item/taperoll/police
name = "police tape"
@@ -116,7 +134,7 @@
breaktape(/obj/item/weapon/wirecutters,user)
/obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user)) ||(!is_cut(W) && !src.allowed(user))))
if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user))))
user << "You can't break the [src] with that!"
return
user.show_viewers("\blue [user] breaks the [src]!")
code/WorkInProgress/animusstation/atm.dm
+19 -11
View File
@@ -18,13 +18,13 @@ log transactions
use_power = 1
idle_power_usage = 10
var/obj/item/weapon/card/id/card
var/obj/item/weapon/money/cashes = list()
var/obj/item/weapon/spacecash/cashes = list()
var/inserted = 0
var/accepted = 0
var/pincode = 0
attackby(var/obj/A, var/mob/user)
if(istype(A,/obj/item/weapon/money))
if(istype(A,/obj/item/weapon/spacecash))
cashes += A
user.drop_item()
A.loc = src
@@ -101,21 +101,21 @@ log transactions
card.money -= amount
switch(amount)
if(1)
new /obj/item/weapon/money(loc)
new /obj/item/weapon/spacecash(loc)
if(10)
new /obj/item/weapon/money/c10(loc)
new /obj/item/weapon/spacecash/c10(loc)
if(20)
new /obj/item/weapon/money/c20(loc)
new /obj/item/weapon/spacecash/c20(loc)
if(50)
new /obj/item/weapon/money/c50(loc)
new /obj/item/weapon/spacecash/c50(loc)
if(100)
new /obj/item/weapon/money/c100(loc)
new /obj/item/weapon/spacecash/c100(loc)
if(200)
new /obj/item/weapon/money/c200(loc)
new /obj/item/weapon/spacecash/c200(loc)
if(500)
new /obj/item/weapon/money/c500(loc)
new /obj/item/weapon/spacecash/c500(loc)
if(1000)
new /obj/item/weapon/money/c1000(loc)
new /obj/item/weapon/spacecash/c1000(loc)
else
user << "\red Error: Insufficient funds."
return
@@ -144,7 +144,7 @@ log transactions
if (usr.machine==src && get_dist(src, usr) <= 1 || istype(usr, /mob/living/silicon/ai))
if(href_list["eca"])
if(accepted)
for(var/obj/item/weapon/money/M in cashes)
for(var/obj/item/weapon/spacecash/M in cashes)
M.loc = loc
inserted = 0
if(!cashes)
@@ -166,3 +166,11 @@ log transactions
else
usr.machine = null
usr << browse(null,"window=atm")
/obj/item/weapon/card/id/proc/checkaccess(p,var/mob/user)
if(p == pin)
user << "\green Access granted"
return 1
user << "\red Access denied"
return 0