Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/defines/obj/weapon.dm

@@ -27,7 +27,7 @@
 
 
 /obj/item/weapon/spacecash
-	name = "space cash"
+	name = "1 credit chip"
 	desc = "It's worth 1 credit."
 	gender = PLURAL
 	icon = 'icons/obj/items.dmi'
@@ -42,35 +42,57 @@
 	w_class = 1.0
 	var/access = list()
 	access = access_crate_cash
+	var/worth = 1
 
 /obj/item/weapon/spacecash/c10
+	name = "10 credit chip"
 	icon_state = "spacecash10"
 	access = access_crate_cash
 	desc = "It's worth 10 credits."
+	worth = 10
+
 /obj/item/weapon/spacecash/c20
+	name = "20 credit chip"
 	icon_state = "spacecash20"
 	access = access_crate_cash
 	desc = "It's worth 20 credits."
+	worth = 20
+
 /obj/item/weapon/spacecash/c50
+	name = "50 credit chip"
 	icon_state = "spacecash50"
 	access = access_crate_cash
 	desc = "It's worth 50 credits."
+	worth = 50
+
 /obj/item/weapon/spacecash/c100
+	name = "100 credit chip"
 	icon_state = "spacecash100"
 	access = access_crate_cash
 	desc = "It's worth 100 credits."
+	worth = 100
+
 /obj/item/weapon/spacecash/c200
+	name = "200 credit chip"
 	icon_state = "spacecash200"
 	access = access_crate_cash
 	desc = "It's worth 200 credits."
+	worth = 200
+
 /obj/item/weapon/spacecash/c500
+	name = "500 credit chip"
 	icon_state = "spacecash500"
 	access = access_crate_cash
 	desc = "It's worth 500 credits."
+	worth = 500
+
 /obj/item/weapon/spacecash/c1000
+	name = "1000 credit chip"
 	icon_state = "spacecash1000"
 	access = access_crate_cash
 	desc = "It's worth 1000 credits."
+	worth = 1000
+
 
 /obj/item/weapon/bananapeel
 	name = "banana peel"