cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

More resprites (Aug 2023) (#17076)

Browse Source 
* New chem cartridges

* IV changes

* more resprites

* Auto stash before merge of "resprites2" and "origin/master"

* Auto stash before merge of "resprites2" and "origin/master"

* new tanks and cash

* removes tripping

* credit chip sound change

* wristbound resprite

* changelog

* changelog2

* deconfliction

* agh
This commit is contained in:
naut
2023-08-21 20:50:13 +08:00
committed by GitHub
parent 9e5fcd509b
commit 74a347b53d
11 changed files with 98 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/economy/cash.dm
+11 -11
View File
@@ -15,8 +15,8 @@
var/access = list()
access = access_crate_cash
var/worth = 0
drop_sound = 'sound/items/drop/paper.ogg'
pickup_sound = 'sound/items/pickup/paper.ogg'
drop_sound = 'sound/items/drop/card.ogg'
pickup_sound = 'sound/items/pickup/card.ogg'
/obj/item/spacecash/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/spacecash))
@@ -73,7 +73,7 @@
add_overlay(ovr)
compile_overlays() // The delay looks weird, so we force an update immediately.
src.desc = "They are worth [worth] credits."
src.desc = "A bundle of Biesel Standard Credit chips. Combined, this is worth [worth] credits."
/obj/item/spacecash/bundle/attack_self(mob/user as mob)
var/amount = input(user, "How many credits do you want to take? (0 to [src.worth])", "Take Money", 20) as num
@@ -108,49 +108,49 @@
/obj/item/spacecash/c1
name = "1 credit chip"
icon_state = "spacecash1"
desc = "It's worth 1 credit."
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 1 credit."
worth = 1
/obj/item/spacecash/c10
name = "10 credit chip"
icon_state = "spacecash10"
desc = "It's worth 10 credits."
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 10 credits."
worth = 10
/obj/item/spacecash/c20
name = "20 credit chip"
icon_state = "spacecash20"
desc = "It's worth 20 credits."
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 20 credits."
worth = 20
/obj/item/spacecash/c50
name = "50 credit chip"
icon_state = "spacecash50"
desc = "It's worth 50 credits."
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 50 credits."
worth = 50
/obj/item/spacecash/c100
name = "100 credit chip"
icon_state = "spacecash100"
desc = "It's worth 100 credits."
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 100 credits."
worth = 100
/obj/item/spacecash/c200
name = "200 credit chip"
icon_state = "spacecash200"
desc = "It's worth 200 credits."
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 200 credits."
worth = 200
/obj/item/spacecash/c500
name = "500 credit chip"
icon_state = "spacecash500"
desc = "It's worth 500 credits."
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 500 credits."
worth = 500
/obj/item/spacecash/c1000
name = "1000 credit chip"
icon_state = "spacecash1000"
desc = "It's worth 1000 credits."
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 1000 credits."
worth = 1000
/proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
code/modules/reagents/dispenser/cartridge.dm
+21
View File
@@ -3,6 +3,7 @@
desc = "This goes in a chemical dispenser."
icon_state = "cartridge"
filling_states = "20;40;60;80;100"
w_class = ITEMSIZE_NORMAL
volume = CARTRIDGE_VOLUME_LARGE
@@ -29,6 +30,19 @@
else
setLabel(R.name)
/obj/item/reagent_containers/chem_disp_cartridge/update_icon()
cut_overlays()
if(reagents?.total_volume)
var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[icon_state]-[get_filling_state()]")
filling.color = reagents.get_color()
add_overlay(filling)
if(!is_open_container())
var/lid_icon = "lid_[icon_state]"
var/mutable_appearance/lid = mutable_appearance(icon, lid_icon)
add_overlay(lid)
/obj/item/reagent_containers/chem_disp_cartridge/examine(mob/user)
..()
to_chat(user, "It has a capacity of [volume] units.")
@@ -65,6 +79,7 @@
to_chat(user, "<span class='notice'>You clear the label on \the [src].</span>")
label = ""
name = initial(name)
update_icon()
/obj/item/reagent_containers/chem_disp_cartridge/attack_self()
..()
@@ -74,6 +89,11 @@
else
to_chat(usr, "<span class = 'notice'>You take the cap off \the [src].</span>")
flags |= OPENCONTAINER
update_icon()
/obj/item/reagent_containers/chem_disp_cartridge/attackby(obj/item/W as obj, mob/user as mob)
..()
update_icon()
/obj/item/reagent_containers/chem_disp_cartridge/afterattack(obj/target, mob/user , flag)
if (!is_open_container() || !flag)
@@ -108,3 +128,4 @@
else
return ..()
update_icon()