mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Chinsky
@@ -235,26 +235,25 @@
|
||||
nanomanager.update_uis(src)
|
||||
return
|
||||
else if(istype(W, /obj/item/weapon/wrench))
|
||||
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
|
||||
if(anchored)
|
||||
user.visible_message("[user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
|
||||
else
|
||||
user.visible_message("[user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
|
||||
|
||||
if(do_after(user, 20))
|
||||
if(!src) return
|
||||
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
|
||||
switch (anchored)
|
||||
if (0)
|
||||
anchored = 1
|
||||
user.visible_message("\The [user] tightens the bolts securing \the [src] to the floor.", "You tighten the bolts securing \the [src] to the floor.")
|
||||
if (1)
|
||||
user.visible_message("\The [user] unfastens the bolts securing \the [src] to the floor.", "You unfasten the bolts securing \the [src] to the floor.")
|
||||
anchored = 0
|
||||
user << "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>"
|
||||
anchored = !anchored
|
||||
return
|
||||
|
||||
else if(src.panel_open)
|
||||
else
|
||||
|
||||
for(var/datum/data/vending_product/R in product_records)
|
||||
if(istype(W, R.product_path))
|
||||
stock(R, user)
|
||||
qdel(W)
|
||||
|
||||
else
|
||||
return
|
||||
..()
|
||||
|
||||
/**
|
||||
@@ -560,7 +559,7 @@
|
||||
|
||||
/obj/machinery/vending/proc/stock(var/datum/data/vending_product/R, var/mob/user)
|
||||
if(src.panel_open)
|
||||
user << "<span class='notice'>You stock \the [src] with \a [R.product_name]</span>"
|
||||
user << "<span class='notice'>You insert \the [src] in the product receptor.</span>"
|
||||
R.amount++
|
||||
|
||||
nanomanager.update_uis(src)
|
||||
@@ -692,7 +691,8 @@
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 6,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 8,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 2, /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 2,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 9,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 2,
|
||||
|
||||
@@ -1470,22 +1470,22 @@
|
||||
name = "Iced Tea"
|
||||
id = "icetea"
|
||||
result = "icetea"
|
||||
required_reagents = list("ice" = 1, "tea" = 3)
|
||||
required_reagents = list("ice" = 1, "tea" = 4)
|
||||
result_amount = 4
|
||||
|
||||
/datum/chemical_reaction/icecoffee
|
||||
name = "Iced Coffee"
|
||||
id = "icecoffee"
|
||||
result = "icecoffee"
|
||||
required_reagents = list("ice" = 1, "coffee" = 3)
|
||||
required_reagents = list("ice" = 1, "coffee" = 4)
|
||||
result_amount = 4
|
||||
|
||||
/datum/chemical_reaction/nuka_cola
|
||||
name = "Nuka Cola"
|
||||
id = "nuka_cola"
|
||||
result = "nuka_cola"
|
||||
required_reagents = list("uranium" = 1, "cola" = 6)
|
||||
result_amount = 6
|
||||
required_reagents = list("uranium" = 1, "cola" = 5)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/moonshine
|
||||
name = "Moonshine"
|
||||
@@ -1599,8 +1599,8 @@
|
||||
name = "White Russian"
|
||||
id = "whiterussian"
|
||||
result = "whiterussian"
|
||||
required_reagents = list("blackrussian" = 3, "cream" = 2)
|
||||
result_amount = 5
|
||||
required_reagents = list("blackrussian" = 2, "cream" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/whiskey_cola
|
||||
name = "Whiskey Cola"
|
||||
@@ -1620,8 +1620,8 @@
|
||||
name = "Bloody Mary"
|
||||
id = "bloodymary"
|
||||
result = "bloodymary"
|
||||
required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("vodka" = 2, "tomatojuice" = 3, "limejuice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/gargle_blaster
|
||||
name = "Pan-Galactic Gargle Blaster"
|
||||
@@ -1648,22 +1648,22 @@
|
||||
name = "Toxins Special"
|
||||
id = "phoronspecial"
|
||||
result = "phoronspecial"
|
||||
required_reagents = list("rum" = 2, "vermouth" = 1, "phoron" = 2)
|
||||
result_amount = 5
|
||||
required_reagents = list("rum" = 2, "vermouth" = 2, "phoron" = 2)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/beepsky_smash
|
||||
name = "Beepksy Smash"
|
||||
id = "beepksysmash"
|
||||
result = "beepskysmash"
|
||||
required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("limejuice" = 1, "whiskey" = 1, "iron" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/doctor_delight
|
||||
name = "The Doctor's Delight"
|
||||
id = "doctordelight"
|
||||
result = "doctorsdelight"
|
||||
required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "tricordrazine" = 1)
|
||||
result_amount = 5
|
||||
required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, "tricordrazine" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/irish_cream
|
||||
name = "Irish Cream"
|
||||
@@ -1718,15 +1718,15 @@
|
||||
name = "Long Island Iced Tea"
|
||||
id = "longislandicedtea"
|
||||
result = "longislandicedtea"
|
||||
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/icedtea
|
||||
name = "Long Island Iced Tea"
|
||||
id = "longislandicedtea"
|
||||
result = "longislandicedtea"
|
||||
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/threemileisland
|
||||
name = "Three Mile Island Iced Tea"
|
||||
@@ -1746,8 +1746,8 @@
|
||||
name = "Black Russian"
|
||||
id = "blackrussian"
|
||||
result = "blackrussian"
|
||||
required_reagents = list("vodka" = 3, "kahlua" = 2)
|
||||
result_amount = 5
|
||||
required_reagents = list("vodka" = 2, "kahlua" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/manhattan
|
||||
name = "Manhattan"
|
||||
@@ -1774,8 +1774,8 @@
|
||||
name = "Gin Fizz"
|
||||
id = "ginfizz"
|
||||
result = "ginfizz"
|
||||
required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("gin" = 1, "sodawater" = 1, "limejuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/bahama_mama
|
||||
name = "Bahama mama"
|
||||
@@ -1802,22 +1802,22 @@
|
||||
name = "Demons Blood"
|
||||
id = "demonsblood"
|
||||
result = "demonsblood"
|
||||
required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("rum" = 3, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/booger
|
||||
name = "Booger"
|
||||
id = "booger"
|
||||
result = "booger"
|
||||
required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("cream" = 2, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/antifreeze
|
||||
name = "Anti-freeze"
|
||||
id = "antifreeze"
|
||||
result = "antifreeze"
|
||||
required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("vodka" = 1, "cream" = 1, "ice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/barefoot
|
||||
name = "Barefoot"
|
||||
@@ -1909,14 +1909,14 @@
|
||||
id = "changelingsting"
|
||||
result = "changelingsting"
|
||||
required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1)
|
||||
result_amount = 5
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/aloe
|
||||
name = "Aloe"
|
||||
id = "aloe"
|
||||
result = "aloe"
|
||||
required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1)
|
||||
result_amount = 2
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/andalusia
|
||||
name = "Andalusia"
|
||||
@@ -1957,8 +1957,8 @@
|
||||
name = "Erika Surprise"
|
||||
id = "erikasurprise"
|
||||
result = "erikasurprise"
|
||||
required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
|
||||
result_amount = 5
|
||||
required_reagents = list("ale" = 2, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/devilskiss
|
||||
name = "Devils Kiss"
|
||||
@@ -2007,14 +2007,14 @@
|
||||
id = "kiraspecial"
|
||||
result = "kiraspecial"
|
||||
required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1)
|
||||
result_amount = 2
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/brownstar
|
||||
name = "Brown Star"
|
||||
id = "brownstar"
|
||||
result = "brownstar"
|
||||
required_reagents = list("orangejuice" = 2, "cola" = 1)
|
||||
result_amount = 2
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/milkshake
|
||||
name = "Milkshake"
|
||||
@@ -2034,8 +2034,8 @@
|
||||
name = "Sui Dream"
|
||||
id = "suidream"
|
||||
result = "suidream"
|
||||
required_reagents = list("space_up" = 2, "bluecuracao" = 1, "melonliquor" = 1)
|
||||
result_amount = 4
|
||||
required_reagents = list("space_up" = 1, "bluecuracao" = 1, "melonliquor" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/* Removed xenoarcheology stuff
|
||||
datum
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#define CELLS 4
|
||||
#define CELLS 8
|
||||
#define CELLSIZE (32/CELLS)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -347,6 +347,33 @@
|
||||
..()
|
||||
reagents.add_reagent("grenadine", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola
|
||||
name = "\improper Space Cola"
|
||||
desc = "Cola. in space"
|
||||
icon_state = "colabottle"
|
||||
center_of_mass = list("x"=16, "y"=6)
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("cola", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up
|
||||
name = "\improper Space-Up"
|
||||
desc = "Tastes like a hull breach in your mouth."
|
||||
icon_state = "space-up_bottle"
|
||||
center_of_mass = list("x"=16, "y"=6)
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("space_up", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind
|
||||
name = "\improper Space Mountain Wind"
|
||||
desc = "Blows right through you like a space wind."
|
||||
icon_state = "space_mountain_wind_bottle"
|
||||
center_of_mass = list("x"=16, "y"=6)
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("spacemountainwind", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
|
||||
name = "Warlock's Velvet"
|
||||
desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
|
||||
|
||||
35
html/changelogs/Hubblenaut-dev.yml
Normal file
35
html/changelogs/Hubblenaut-dev.yml
Normal file
@@ -0,0 +1,35 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Hubblenaut
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "Adds glass bottles for Cola, Space Up and Space Mountain Wind to Booze-O-Mat."
|
||||
- tweak: "Some bar drink recipes have been amended to easily sum to 30 units for drinking glasses."
|
||||
- tweak: "Vendors now have a product receptor for accepting goods. Opening the maintenance painel is no longer required."
|
||||
- tweak: "Wrenching a vending machine is no longer a silent action."
|
||||
- tweak: "Stepup: Item placement on 4x4 grids seemed to work great. Now we'll try 8x8."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 70 KiB |
Reference in New Issue
Block a user