cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts.

Browse Source
This commit is contained in:
davipatury
2017-03-08 12:57:45 -03:00
parent 443df9e7de 2c23ee82d8
commit 781e66ec52
122 changed files with 1071 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/lootdrop.dm
+1 -1
View File
@@ -192,7 +192,7 @@
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/scanning_module = 1,
/obj/item/weapon/spacecash/c200 = 1,
/obj/item/stack/spacecash/c200 = 1,
/obj/item/weapon/airlock_electronics = 1,
/obj/item/weapon/gun/energy/kinetic_accelerator = 1,
/obj/item/pizzabox = 3,
code/game/objects/items/devices/modkit.dm
+2 -2
View File
@@ -10,8 +10,8 @@
var/target_species = "Human"
var/list/permitted_types = list(
/obj/item/clothing/head/helmet/space/rig,
/obj/item/clothing/suit/space/rig
/obj/item/clothing/head/helmet/space/hardsuit,
/obj/item/clothing/suit/space/hardsuit
)
/obj/item/device/modkit/afterattack(obj/O, mob/user as mob, proximity)
code/game/objects/items/weapons/RSF.dm
+2 -2
View File
@@ -69,7 +69,7 @@ RSF
if(istype(A, /obj/structure/table) && matter >= 1)
to_chat(user, "Dispensing Dosh...")
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/spacecash/c10( A.loc )
new /obj/item/stack/spacecash/c10( A.loc )
if(isrobot(user))
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
@@ -83,7 +83,7 @@ RSF
if(istype(A, /turf/simulated/floor) && matter >= 1)
to_chat(user, "Dispensing Dosh...")
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/spacecash/c10( A )
new /obj/item/stack/spacecash/c10( A )
if(isrobot(user))
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
code/game/objects/items/weapons/cash.dm
+43 -110
View File
@@ -1,125 +1,58 @@
var/global/list/moneytypes=list(
/obj/item/weapon/spacecash/c1000 = 1000,
/obj/item/weapon/spacecash/c500 = 500,
/obj/item/weapon/spacecash/c200 = 200,
/obj/item/weapon/spacecash/c100 = 100,
/obj/item/weapon/spacecash/c50 = 50,
/obj/item/weapon/spacecash/c20 = 20,
/obj/item/weapon/spacecash/c10 = 10,
/obj/item/weapon/spacecash = 1,
)
/obj/item/weapon/spacecash
name = "credit chip"
/obj/item/stack/spacecash
name = "1 Credit"
desc = "Money money money."
gender = PLURAL
icon = 'icons/obj/money.dmi'
icon_state = "cash1"
opacity = 0
density = 0
anchored = 0.0
force = 1.0
throwforce = 1.0
icon = 'icons/goonstation/objects/money.dmi'
icon_state = "cashgreen"
hitsound = "swing_hit"
force = 1
throwforce = 1
throw_speed = 1
throw_range = 2
w_class = 1
throw_range = 7
w_class = WEIGHT_CLASS_TINY
burn_state = FLAMMABLE
var/access = list()
access = access_crate_cash
var/worth = 1 // Per chip
var/amount = 1 // number of chips
var/stack_color = "#4E054F"
singular_name = "credit"
max_amount = 1000000
/obj/item/weapon/spacecash/New(var/new_loc,var/new_amount=1)
loc = new_loc
name = "[worth] credit chip"
amount = new_amount
/obj/item/stack/spacecash/New(loc, amt = null)
..()
update_icon()
/obj/item/weapon/spacecash/examine(mob/user)
if(amount>1)
to_chat(user, "[bicon(src)] This is a stack of [amount] [src]s.")
/obj/item/stack/spacecash/update_icon()
..()
name = "[amount == max_amount ? "1000000" : amount] Credit[amount > 1 ? "s" : ""]"
if(amount >= 1 && amount < 10)
icon_state = "cashgreen"
else if(amount >= 10 && amount < 50)
icon_state = "spacecash"
else if(amount >= 50 && amount < 500)
icon_state = "cashblue"
else if(amount >= 500 && amount < 1000)
icon_state = "cashindi"
else if(amount >= 1000 && amount < 1000000)
icon_state = "cashpurp"
else
to_chat(user, "[bicon(src)] This is \a [src]s.")
to_chat(user, "It's worth [worth*amount] credits.")
icon_state = "cashrbow"
/obj/item/weapon/spacecash/update_icon()
icon_state = "cash[worth]"
// Up to 100 items per stack.
pixel_x=rand(-7,7)
pixel_y=rand(-14,14)
/obj/item/stack/spacecash/c10
amount = 10
/obj/item/weapon/spacecash/proc/collect_from(var/obj/item/weapon/spacecash/cash)
if(cash.worth == src.worth)
var/taking = min(100-src.amount,cash.amount)
cash.amount -= taking
src.amount += taking
if(cash.amount <= 0)
qdel(cash)
return taking
return 0
/obj/item/stack/spacecash/c20
amount = 20
/obj/item/weapon/spacecash/afterattack(atom/A as mob|obj, mob/user as mob)
if(istype(A, /turf) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack))
var/turf/T = get_turf(A)
var/collected = 0
for(var/obj/item/weapon/spacecash/cash in T)
if(cash.worth == src.worth)
collected += collect_from(cash)
if(collected)
update_icon()
to_chat(user, "<span class='notice'>You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash.</span>")
else if(istype(A,/obj/item/weapon/spacecash))
var/obj/item/weapon/spacecash/cash = A
var/collected = src.collect_from(cash)
if(collected)
update_icon()
to_chat(user, "<span class='notice'>You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash.</span>")
/obj/item/stack/spacecash/c50
amount = 50
/obj/item/stack/spacecash/c100
amount = 100
/obj/item/weapon/spacecash/proc/get_total()
return worth * amount
/obj/item/stack/spacecash/c200
amount = 200
/obj/item/weapon/spacecash/c10
icon_state = "cash10"
worth = 10
/obj/item/stack/spacecash/c500
amount = 500
/obj/item/weapon/spacecash/c20
icon_state = "cash10"
worth = 20
/obj/item/stack/spacecash/c1000
amount = 1000
/obj/item/weapon/spacecash/c50
icon_state = "cash10"
worth = 50
/obj/item/weapon/spacecash/c100
icon_state = "cash100"
worth = 100
/obj/item/weapon/spacecash/c200
icon_state = "cash200"
worth = 200
/obj/item/weapon/spacecash/c500
icon_state = "cash500"
worth = 500
/obj/item/weapon/spacecash/c1000
icon_state = "cash1000"
worth = 1000
/proc/dispense_cash(var/amount, var/loc)
for(var/cashtype in moneytypes)
var/slice = moneytypes[cashtype]
var/dispense_count = Floor(amount/slice)
amount = amount % slice
while(dispense_count>0)
var/dispense_this_time = min(dispense_count,100)
if(dispense_this_time > 0)
new cashtype(loc,dispense_this_time)
dispense_count -= dispense_this_time
/proc/count_cash(var/list/cash)
. = 0
for(var/obj/item/weapon/spacecash/C in cash)
. += C.get_total()
/obj/item/stack/spacecash/c1000000
amount = 1000000
code/game/objects/items/weapons/storage/backpack.dm
+2 -2
View File
@@ -189,7 +189,7 @@
/obj/item/weapon/storage/backpack/satchel_norm
name = "satchel"
desc = "A deluxe NT Satchel, made of the highest quality leather."
icon_state = "satchel"
icon_state = "satchel-norm"
/obj/item/weapon/storage/backpack/satchel_eng
name = "industrial satchel"
@@ -447,4 +447,4 @@
/obj/item/weapon/storage/backpack/ert/janitor
name = "emergency response team janitor backpack"
desc = "A spacious backpack with lots of pockets, worn by janitorial members of a Nanotrasen Emergency Response Team."
icon_state = "ert_janitor"
icon_state = "ert_janitor"
code/game/objects/items/weapons/storage/bags.dm
+1 -1
View File
@@ -346,7 +346,7 @@
max_w_class = 3
w_class = 1
can_hold = list("/obj/item/weapon/coin","/obj/item/weapon/spacecash")
can_hold = list("/obj/item/weapon/coin","/obj/item/stack/spacecash")
// -----------------------------
// Book bag
code/game/objects/items/weapons/storage/bible.dm
+3 -3
View File
@@ -23,9 +23,9 @@
..()
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/weapon/spacecash(src)
new /obj/item/weapon/spacecash(src)
new /obj/item/weapon/spacecash(src)
new /obj/item/stack/spacecash(src)
new /obj/item/stack/spacecash(src)
new /obj/item/stack/spacecash(src)
//BS12 EDIT
// All cult functionality moved to Null Rod
/obj/item/weapon/storage/bible/proc/bless(mob/living/carbon/M as mob)
code/game/objects/items/weapons/storage/secure.dm
+3 -3
View File
@@ -56,7 +56,7 @@
else
user.show_message("<span class='danger'>Unable to reset internal memory.</span>", 1)
l_hacking = 0
else
else
l_hacking = 0
return
//At this point you have exhausted all the special things to do when locked
@@ -212,9 +212,9 @@
force = 15
/obj/item/weapon/storage/secure/briefcase/syndie/New()
..()
..()
for(var/i = 0, i < storage_slots - 2, i++)
handle_item_insertion(new /obj/item/weapon/spacecash/c1000, 1)
handle_item_insertion(new /obj/item/stack/spacecash/c1000, 1)
// -----------------------------
// Secure Safe
code/game/objects/items/weapons/storage/uplink_kits.dm
+9 -9
View File
@@ -99,34 +99,34 @@
/obj/item/weapon/storage/box/syndie_kit/hardsuit
name = "Boxed Blood Red Suit and Helmet"
can_hold = list("/obj/item/clothing/suit/space/rig/syndi", "/obj/item/clothing/head/helmet/space/rig/syndi")
can_hold = list("/obj/item/clothing/suit/space/hardsuit/syndi", "/obj/item/clothing/head/helmet/space/hardsuit/syndi")
max_w_class = 3
/obj/item/weapon/storage/box/syndie_kit/hardsuit/New()
..()
new /obj/item/clothing/suit/space/rig/syndi(src)
new /obj/item/clothing/head/helmet/space/rig/syndi(src)
new /obj/item/clothing/suit/space/hardsuit/syndi(src)
new /obj/item/clothing/head/helmet/space/hardsuit/syndi(src)
return
/obj/item/weapon/storage/box/syndie_kit/elite_hardsuit
name = "Boxed Elite Syndicate Hardsuit and Helmet"
can_hold = list("/obj/item/clothing/suit/space/rig/syndi/elite", "/obj/item/clothing/head/helmet/space/rig/syndi/elite")
can_hold = list("/obj/item/clothing/suit/space/hardsuit/syndi/elite", "/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite")
max_w_class = 3
/obj/item/weapon/storage/box/syndie_kit/elite_hardsuit/New()
..()
new /obj/item/clothing/suit/space/rig/syndi/elite(src)
new /obj/item/clothing/head/helmet/space/rig/syndi/elite(src)
new /obj/item/clothing/suit/space/hardsuit/syndi/elite(src)
new /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite(src)
/obj/item/weapon/storage/box/syndie_kit/shielded_hardsuit
name = "Boxed Shielded Syndicate Hardsuit and Helmet"
can_hold = list("/obj/item/clothing/suit/space/rig/shielded/syndi", "/obj/item/clothing/head/helmet/space/rig/shielded/syndi")
can_hold = list("/obj/item/clothing/suit/space/hardsuit/shielded/syndi", "/obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi")
max_w_class = 4
/obj/item/weapon/storage/box/syndie_kit/shielded_hardsuit/New()
..()
new /obj/item/clothing/suit/space/rig/shielded/syndi(src)
new /obj/item/clothing/head/helmet/space/rig/shielded/syndi(src)
new /obj/item/clothing/suit/space/hardsuit/shielded/syndi(src)
new /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi(src)
/obj/item/weapon/storage/box/syndie_kit/conversion
name = "box (CK)"
code/game/objects/items/weapons/storage/wallets.dm
+11 -11
View File
@@ -7,7 +7,7 @@
w_class = 2
burn_state = FLAMMABLE
can_hold = list(
"/obj/item/weapon/spacecash",
"/obj/item/stack/spacecash",
"/obj/item/weapon/card",
"/obj/item/clothing/mask/cigarette",
"/obj/item/device/flashlight/pen",
@@ -76,18 +76,18 @@
/obj/item/weapon/storage/wallet/random/New()
..()
var/item1_type = pick(/obj/item/weapon/spacecash,
/obj/item/weapon/spacecash/c10,
/obj/item/weapon/spacecash/c100,
/obj/item/weapon/spacecash/c500,
/obj/item/weapon/spacecash/c1000)
var/item1_type = pick(/obj/item/stack/spacecash,
/obj/item/stack/spacecash/c10,
/obj/item/stack/spacecash/c100,
/obj/item/stack/spacecash/c500,
/obj/item/stack/spacecash/c1000)
var/item2_type
if(prob(50))
item2_type = pick(/obj/item/weapon/spacecash,
/obj/item/weapon/spacecash/c10,
/obj/item/weapon/spacecash/c100,
/obj/item/weapon/spacecash/c500,
/obj/item/weapon/spacecash/c1000)
item2_type = pick(/obj/item/stack/spacecash,
/obj/item/stack/spacecash/c10,
/obj/item/stack/spacecash/c100,
/obj/item/stack/spacecash/c500,
/obj/item/stack/spacecash/c1000)
var/item3_type = pick( /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron )
spawn(2)
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+8 -5
View File
@@ -87,11 +87,14 @@
icon_off = "fridge1"
req_access = list(access_heads_vault)
New()
..()
dispense_cash(6700, src)
/obj/structure/closet/secure_closet/freezer/money/New()
..()
for(var/i in 1 to 3)
new /obj/item/stack/spacecash/c1000(src)
for(var/i in 1 to 5)
new /obj/item/stack/spacecash/c500(src)
for(var/i in 1 to 6)
new /obj/item/stack/spacecash/c200(src)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+2 -2
View File
@@ -23,9 +23,9 @@
/obj/structure/closet/syndicate/suits/New()
..()
new /obj/item/clothing/head/helmet/space/rig/syndi(src)
new /obj/item/clothing/head/helmet/space/hardsuit/syndi(src)
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/suit/space/rig/syndi(src)
new /obj/item/clothing/suit/space/hardsuit/syndi(src)
new /obj/item/weapon/tank/jetpack/oxygen/harness(src)
/obj/structure/closet/syndicate/nuclear