Merge pull request #947 from quotefox/ecom-2

loose ends.
This commit is contained in:
QuoteFox
2021-02-04 14:47:05 +00:00
committed by GitHub
14 changed files with 18 additions and 4 deletions
+3
View File
@@ -8,6 +8,7 @@
item_color="yellow"
resistance_flags = NONE
var/can_be_cut = 1
price = 10
/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
@@ -19,6 +20,7 @@
item_color="yellow"
resistance_flags = NONE
var/can_be_cut = 1
price = 5
/obj/item/clothing/gloves/color/fyellow/New()
..()
@@ -113,6 +115,7 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
resistance_flags = NONE
price = 12
/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
+1
View File
@@ -260,6 +260,7 @@
name = "security's bitch beret"
desc = "A softer beret with the word 'BITCH' embroidered on it in pink thread."
icon_state = "bitchberet"
price = 5
//Curator
/obj/item/clothing/head/fedora/curator
+2 -1
View File
@@ -65,7 +65,7 @@
var/obj/item/organ/heart/heart = M.getorganslot(ORGAN_SLOT_HEART)
var/obj/item/organ/lungs/lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
if (!do_mob(user,M,60)) // Stethoscope should take a moment to listen
return // FAIL
@@ -302,3 +302,4 @@
icon = 'icons/obj/clothing/neck.dmi'
icon_state = "bling"
item_color = "bling"
price = 30
@@ -137,6 +137,7 @@
desc = "A pair of knee-high jackboots, complete with heels. All style, all the time."
icon_state = "jackboots-tall"
item_state = "jackboots-tall"
price = 5
/obj/item/clothing/shoes/jackboots/fast
slowdown = -1
+1
View File
@@ -169,6 +169,7 @@
cold_protection = CHEST|LEGS|ARMS
heat_protection = CHEST|LEGS|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION //you don't need it
price = 5
//Surgeon
/obj/item/clothing/suit/apron/surgical
@@ -381,6 +381,7 @@
item_state = "b_suit"
item_color = "galaxy_blue"
can_adjust = FALSE
price = 10
/obj/item/clothing/under/lawyer/galaxy_red
name = "\improper Pulsar Gonne"
@@ -406,6 +406,7 @@
isGlass = FALSE
list_reagents = list(/datum/reagent/consumable/cream = 100)
foodtype = DAIRY
price = 3
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "tomato juice"
@@ -90,6 +90,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
name = "Nuka Cola"
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
price = 7
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
name = "Syndicat Bomb"
@@ -186,6 +186,7 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/milk = 50)
possible_states = list()
price = 5
/obj/item/reagent_containers/food/condiment/flour
name = "flour sack"
+1 -1
View File
@@ -366,7 +366,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
if(extended_inventory) //hacking shows all inventory now since coins arent worth anything.
display_records = product_records + hidden_records + coin_records
else
display_records = product_records
display_records = product_records + coin_records
dat += "<table>"
for (var/datum/data/vending_product/R in display_records)
dat += "<tr><td><img src='data:image/jpeg;base64,[GetIconForProduct(R)]'/></td>"