Coonflict fiiixeeess

This commit is contained in:
Artur
2020-05-13 12:56:17 +03:00
261 changed files with 3312 additions and 1483 deletions
+4 -2
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/economy.dmi'
icon_state = "spacecash"
amount = 1
max_amount = 20
max_amount = INFINITY
throwforce = 0
throw_speed = 2
throw_range = 2
@@ -18,9 +18,11 @@
update_desc()
/obj/item/stack/spacecash/proc/update_desc()
var/total_worth = amount*value
var/total_worth = get_item_credit_value()
desc = "It's worth [total_worth] credit[( total_worth > 1 ) ? "s" : ""]"
/obj/item/stack/spacecash/get_item_credit_value()
return (amount*value)
/obj/item/stack/spacecash/merge(obj/item/stack/S)
. = ..()
@@ -96,6 +96,7 @@
var/stop_bleeding = 1800
var/heal_brute = 5
self_delay = 10
custom_price = 100
/obj/item/stack/medical/gauze/heal(mob/living/M, mob/user)
if(ishuman(M))