mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 07:59:01 +01:00
Merge branch 'master' of git://github.com/Abi79/tgstation13-git
Conflicts: baystation12.dme code/defines/mob/mob.dm code/defines/obj/vending.dm code/game/atom_procs.dm code/game/dna.dm code/game/machinery/computer/aifixer.dm code/game/vote.dm code/modules/chemical/Chemistry-Machinery.dm code/modules/chemical/Chemistry-Reagents.dm code/modules/mob/living/carbon/metroid/life.dm html/changelog.html icons/obj/stationobjs.dmi interface/skin.dmf maps/tgstation.2.0.8.dmm
This commit is contained in:
Miniature
+18
-17
@@ -10,7 +10,8 @@
|
||||
var/welded = 0
|
||||
var/wall_mounted = 0 //never solid (You can always pass over it)
|
||||
flags = FPRINT
|
||||
var/health = 200//Might be a bit much, dono can always change later
|
||||
var/health = 100 //Might be a bit much, dono can always change later //Nerfed -Pete
|
||||
var/lastbang //
|
||||
|
||||
/obj/structure/closet/acloset
|
||||
name = "Strange closet"
|
||||
@@ -277,7 +278,7 @@
|
||||
|
||||
/obj/structure/closet/jcloset
|
||||
name = "Custodial Closet"
|
||||
desc = "A bulky (yet mobile) closet. Comes with janitor's clothes and biohazard gear."
|
||||
desc = "A bulky (yet mobile) closet. Comes with janitor's clothes and gear."
|
||||
|
||||
/obj/structure/closet/lawcloset
|
||||
name = "Legal Closet"
|
||||
@@ -581,25 +582,25 @@
|
||||
|
||||
|
||||
|
||||
/obj/structure/secure_closet
|
||||
/obj/structure/closet/secure_closet
|
||||
desc = "An immobile card-locked storage closet."
|
||||
name = "Security Locker"
|
||||
icon = 'closet.dmi'
|
||||
icon_state = "secure1"
|
||||
density = 1
|
||||
var/opened = 0
|
||||
opened = 0
|
||||
var/locked = 1
|
||||
var/broken = 0
|
||||
var/large = 1
|
||||
var/icon_closed = "secure"
|
||||
icon_closed = "secure"
|
||||
var/icon_locked = "secure1"
|
||||
var/icon_opened = "secureopen"
|
||||
icon_opened = "secureopen"
|
||||
var/icon_broken = "securebroken"
|
||||
var/icon_off = "secureoff"
|
||||
var/wall_mounted = 0 //never solid (You can always pass over it)
|
||||
var/health = 300
|
||||
wall_mounted = 0 //never solid (You can always pass over it)
|
||||
health = 200
|
||||
|
||||
/obj/structure/secure_closet/medical_wall
|
||||
/obj/structure/closet/secure_closet/medical_wall
|
||||
name = "First Aid Closet"
|
||||
desc = "A wall mounted closet which --should-- contain medical supplies."
|
||||
icon_state = "medical_wall_locked"
|
||||
@@ -613,21 +614,21 @@
|
||||
wall_mounted = 1
|
||||
req_access = list(access_medical)
|
||||
|
||||
/obj/structure/secure_closet/personal
|
||||
/obj/structure/closet/secure_closet/personal
|
||||
desc = "The first card swiped gains control."
|
||||
name = "Personal Closet"
|
||||
|
||||
/obj/structure/secure_closet/personal/patient
|
||||
/obj/structure/closet/secure_closet/personal/patient
|
||||
name = "Patient's closet"
|
||||
|
||||
/obj/structure/secure_closet/kitchen
|
||||
/obj/structure/closet/secure_closet/kitchen
|
||||
name = "Kitchen Cabinet"
|
||||
req_access = list(access_kitchen)
|
||||
|
||||
/obj/structure/secure_closet/kitchen/mining
|
||||
/obj/structure/closet/secure_closet/kitchen/mining
|
||||
req_access = list()
|
||||
|
||||
/obj/structure/secure_closet/meat
|
||||
/obj/structure/closet/secure_closet/meat
|
||||
name = "Meat Fridge"
|
||||
icon_state = "fridge1"
|
||||
icon_closed = "fridge"
|
||||
@@ -636,7 +637,7 @@
|
||||
icon_broken = "fridgebroken"
|
||||
icon_off = "fridge1"
|
||||
|
||||
/obj/structure/secure_closet/fridge
|
||||
/obj/structure/closet/secure_closet/fridge
|
||||
name = "Refrigerator"
|
||||
icon_state = "fridge1"
|
||||
icon_closed = "fridge"
|
||||
@@ -645,7 +646,7 @@
|
||||
icon_broken = "fridgebroken"
|
||||
icon_off = "fridge1"
|
||||
|
||||
/obj/structure/secure_closet/money_freezer
|
||||
/obj/structure/closet/secure_closet/money_freezer
|
||||
name = "Freezer"
|
||||
icon_state = "fridge1"
|
||||
icon_closed = "fridge"
|
||||
@@ -655,7 +656,7 @@
|
||||
icon_off = "fridge1"
|
||||
req_access = list(access_heads_vault)
|
||||
|
||||
/obj/structure/secure_closet/wall
|
||||
/obj/structure/closet/secure_closet/wall
|
||||
name = "wall locker"
|
||||
req_access = list(access_security)
|
||||
icon_state = "wall-locker1"
|
||||
|
||||
@@ -267,10 +267,18 @@
|
||||
|
||||
/obj/effect/decal/cleanable/egg_smudge
|
||||
name = "Smashed egg"
|
||||
desc = ""
|
||||
desc = "Seems like this one won't hatch"
|
||||
density = 0
|
||||
anchored = 1
|
||||
layer = 2
|
||||
icon = 'tomatodecal.dmi'
|
||||
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
|
||||
|
||||
/obj/effect/decal/cleanable/pie_smudge //honk
|
||||
name = "Smashed pie"
|
||||
desc = "Pie cream from a cream pie"
|
||||
density = 0
|
||||
anchored = 1
|
||||
layer = 2
|
||||
icon = 'tomatodecal.dmi'
|
||||
random_icon_states = list("smashed_pie")
|
||||
|
||||
@@ -12,6 +12,15 @@
|
||||
desc = "A backpack and trophy rack, useful for both carrying extra gear and proudly declaring your insanity "
|
||||
icon_state = "cultpack"
|
||||
|
||||
/obj/item/weapon/storage/trashbag
|
||||
name = "trash bag"
|
||||
desc = "for picking up all those pens"
|
||||
icon_state = "trashbag"
|
||||
item_state = "trashbag"
|
||||
w_class = 4.0
|
||||
storage_slots = 20
|
||||
max_w_class = 1
|
||||
max_combined_w_class = 20
|
||||
/*
|
||||
/obj/item/weapon/storage/lbe
|
||||
name = "Load Bearing Equipment"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"/obj/item/weapon/pen/paralysis",
|
||||
"/obj/item/weapon/chem_grenade/incendiary")
|
||||
cost = 20
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Special Ops crate"
|
||||
hidden = 1
|
||||
|
||||
@@ -113,14 +113,14 @@
|
||||
"/obj/item/weapon/reagent_containers/food/snacks/grown/banana",
|
||||
"/obj/item/weapon/reagent_containers/food/snacks/grown/banana")
|
||||
cost = 5
|
||||
containertype = "/obj/structure/crate/freezer"
|
||||
containertype = "/obj/structure/closet/crate/freezer"
|
||||
containername = "Food crate"
|
||||
|
||||
/datum/supply_packs/monkey
|
||||
name = "Monkey crate"
|
||||
contains = list ("/obj/item/weapon/monkeycube_box")
|
||||
cost = 20
|
||||
containertype = "/obj/structure/crate/freezer"
|
||||
containertype = "/obj/structure/closet/crate/freezer"
|
||||
containername = "Monkey crate"
|
||||
|
||||
/*
|
||||
@@ -130,7 +130,7 @@
|
||||
"/obj/item/ammo_casing/shotgun/beanbag",
|
||||
"/obj/item/ammo_casing/shotgun/beanbag")
|
||||
cost = 25
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Shotgun crate"
|
||||
//APPARENTLY OP?
|
||||
*/
|
||||
@@ -148,7 +148,7 @@
|
||||
"/obj/item/ammo_casing/shotgun/beanbag",
|
||||
"/obj/item/ammo_casing/shotgun/beanbag")
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Beanbag shells"
|
||||
|
||||
/datum/supply_packs/party
|
||||
@@ -164,7 +164,7 @@
|
||||
"/obj/item/weapon/reagent_containers/food/drinks/beer",
|
||||
"/obj/item/weapon/reagent_containers/food/drinks/beer")
|
||||
cost = 20
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Party equipment"
|
||||
|
||||
/datum/supply_packs/internals
|
||||
@@ -176,7 +176,7 @@
|
||||
"/obj/item/weapon/tank/air",
|
||||
"/obj/item/weapon/tank/air")
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate/internals"
|
||||
containertype = "/obj/structure/closet/crate/internals"
|
||||
containername = "Internals crate"
|
||||
|
||||
/datum/supply_packs/evacuation
|
||||
@@ -196,7 +196,7 @@
|
||||
"/obj/item/clothing/mask/gas",
|
||||
"/obj/item/clothing/mask/gas")
|
||||
cost = 35
|
||||
containertype = "/obj/structure/crate/internals"
|
||||
containertype = "/obj/structure/closet/crate/internals"
|
||||
containername = "Emergency Crate"
|
||||
|
||||
/datum/supply_packs/janitor
|
||||
@@ -214,7 +214,7 @@
|
||||
"/obj/item/weapon/chem_grenade/cleaner",
|
||||
"/obj/structure/mopbucket")
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Janitorial supplies"
|
||||
|
||||
/obj/item/weapon/storage/lightbox/tubes
|
||||
@@ -230,7 +230,7 @@
|
||||
"/obj/item/weapon/storage/lightbox/bulbs",
|
||||
"/obj/item/weapon/storage/lightbox/bulbs")
|
||||
cost = 5
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Replacement lights"
|
||||
|
||||
/datum/supply_packs/costume
|
||||
@@ -248,7 +248,7 @@
|
||||
"/obj/item/clothing/suit/suspenders",
|
||||
"/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing")
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Standard Costumes"
|
||||
access = access_theatre
|
||||
|
||||
@@ -259,14 +259,14 @@
|
||||
"/obj/item/clothing/shoes/sandal",
|
||||
"/obj/item/clothing/head/wizard/fake")
|
||||
cost = 20
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Wizard costume crate"
|
||||
|
||||
/datum/supply_packs/mule
|
||||
name = "MULEbot Crate"
|
||||
contains = list("/obj/machinery/bot/mulebot")
|
||||
cost = 20
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "MULEbot Crate"
|
||||
|
||||
/datum/supply_packs/hydroponics // -- Skie
|
||||
@@ -280,7 +280,7 @@
|
||||
"/obj/item/clothing/gloves/botanic_leather",
|
||||
"/obj/item/clothing/suit/apron") // Updated with new things
|
||||
cost = 10
|
||||
containertype = /obj/structure/crate/hydroponics
|
||||
containertype = /obj/structure/closet/crate/hydroponics
|
||||
containername = "Hydroponics crate"
|
||||
access = access_hydroponics
|
||||
|
||||
@@ -298,7 +298,7 @@
|
||||
"/obj/item/seeds/chantermycelium",
|
||||
"/obj/item/seeds/potatoseed")
|
||||
cost = 10
|
||||
containertype = /obj/structure/crate/hydroponics
|
||||
containertype = /obj/structure/closet/crate/hydroponics
|
||||
containername = "Seeds crate"
|
||||
access = access_hydroponics
|
||||
|
||||
@@ -315,7 +315,7 @@
|
||||
"/obj/item/seeds/bananaseed",
|
||||
"/obj/item/seeds/eggyseed")
|
||||
cost = 15
|
||||
containertype = /obj/structure/crate/hydroponics
|
||||
containertype = /obj/structure/closet/crate/hydroponics
|
||||
containername = "Exotic Seeds crate"
|
||||
access = access_hydroponics
|
||||
|
||||
@@ -330,7 +330,7 @@
|
||||
"/obj/item/weapon/reagent_containers/glass/bottle/stoxin",
|
||||
"/obj/item/weapon/storage/syringes")
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate/medical"
|
||||
containertype = "/obj/structure/closet/crate/medical"
|
||||
containername = "Medical crate"
|
||||
|
||||
|
||||
@@ -347,7 +347,7 @@
|
||||
"/obj/item/weapon/storage/syringes",
|
||||
"/obj/item/weapon/storage/beakerbox")
|
||||
cost = 20
|
||||
containertype = "/obj/structure/crate/secure/weapon"
|
||||
containertype = "/obj/structure/closet/crate/secure/weapon"
|
||||
containername = "Virus crate"
|
||||
access = access_cmo
|
||||
|
||||
@@ -356,7 +356,7 @@
|
||||
contains = list("/obj/item/stack/sheet/metal")
|
||||
amount = 50
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Metal sheets crate"
|
||||
|
||||
/datum/supply_packs/glass50
|
||||
@@ -364,7 +364,7 @@
|
||||
contains = list("/obj/item/stack/sheet/glass")
|
||||
amount = 50
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Glass sheets crate"
|
||||
|
||||
/datum/supply_packs/electrical
|
||||
@@ -378,7 +378,7 @@
|
||||
"/obj/item/weapon/cell/high",
|
||||
"/obj/item/weapon/cell/high")
|
||||
cost = 15
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Electrical maintenance crate"
|
||||
|
||||
/datum/supply_packs/mechanical
|
||||
@@ -393,7 +393,7 @@
|
||||
"/obj/item/clothing/head/helmet/welding",
|
||||
"/obj/item/clothing/head/helmet/hardhat")
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Mechanical maintenance crate"
|
||||
|
||||
/datum/supply_packs/waterfueltank
|
||||
@@ -401,7 +401,7 @@
|
||||
contains = list("/obj/structure/reagent_dispensers/watertank",
|
||||
"/obj/structure/reagent_dispensers/fueltank")
|
||||
cost = 15
|
||||
containertype = "/obj/structure/crate"
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Water/Fuel tank crate"
|
||||
|
||||
/datum/supply_packs/engine
|
||||
@@ -409,7 +409,7 @@
|
||||
contains = list("/obj/machinery/emitter",
|
||||
"/obj/machinery/emitter",)
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Emitter crate"
|
||||
access = access_heads
|
||||
|
||||
@@ -449,7 +449,7 @@
|
||||
"/obj/item/mecha_parts/circuitboard/ripley/peripherals", //TEMPORARY due to lack of circuitboard printer
|
||||
"/obj/item/mecha_parts/circuitboard/ripley/main") //TEMPORARY due to lack of circuitboard printer
|
||||
cost = 40
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "APLU \"Ripley\" Circuit Crate"
|
||||
access = access_robotics
|
||||
|
||||
@@ -466,7 +466,7 @@
|
||||
"/obj/item/weapon/cell/high",
|
||||
"/obj/item/weapon/cell/high")
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate/secure/gear"
|
||||
containertype = "/obj/structure/closet/crate/secure/gear"
|
||||
containername = "Robotics Assembly"
|
||||
access = access_robotics
|
||||
|
||||
@@ -485,7 +485,7 @@
|
||||
"/obj/item/device/assembly/timer",
|
||||
"/obj/item/device/assembly/timer")
|
||||
cost = 10
|
||||
containertype = "/obj/structure/crate/secure/plasma"
|
||||
containertype = "/obj/structure/closet/crate/secure/plasma"
|
||||
containername = "Plasma assembly crate"
|
||||
access = access_tox
|
||||
|
||||
@@ -500,7 +500,7 @@
|
||||
"/obj/item/weapon/storage/flashbang_kit",
|
||||
"/obj/item/weapon/storage/flashbang_kit")
|
||||
cost = 30
|
||||
containertype = "/obj/structure/crate/secure/weapon"
|
||||
containertype = "/obj/structure/closet/crate/secure/weapon"
|
||||
containername = "Weapons crate"
|
||||
access = access_security
|
||||
|
||||
@@ -514,7 +514,7 @@
|
||||
"/obj/item/weapon/chem_grenade/incendiary",
|
||||
"/obj/item/weapon/chem_grenade/incendiary")
|
||||
cost = 25
|
||||
containertype = "/obj/structure/crate/secure/weapon"
|
||||
containertype = "/obj/structure/closet/crate/secure/weapon"
|
||||
containername = "Experimental weapons crate"
|
||||
access = access_heads
|
||||
|
||||
@@ -525,7 +525,7 @@
|
||||
"/obj/item/clothing/suit/armor/vest",
|
||||
"/obj/item/clothing/suit/armor/vest")
|
||||
cost = 15
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Armor crate"
|
||||
access = access_security
|
||||
|
||||
@@ -550,7 +550,7 @@
|
||||
"/obj/item/clothing/head/helmet/riot",
|
||||
"/obj/item/clothing/suit/armor/riot")
|
||||
cost = 60
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Riot gear crate"
|
||||
access = access_armory
|
||||
|
||||
@@ -558,7 +558,7 @@
|
||||
name = "Loyalty implant crate"
|
||||
contains = list ("/obj/item/weapon/storage/lockbox/loyalty")
|
||||
cost = 60
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Loyalty implant crate"
|
||||
access = access_armory
|
||||
|
||||
@@ -569,7 +569,7 @@
|
||||
"/obj/item/weapon/gun/projectile/shotgun/combat2",
|
||||
"/obj/item/weapon/gun/projectile/shotgun/combat2")
|
||||
cost = 50
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Ballistic gear crate"
|
||||
access = access_armory
|
||||
|
||||
@@ -580,7 +580,7 @@
|
||||
"/obj/item/weapon/gun/energy/gun",
|
||||
"/obj/item/weapon/gun/energy/gun")
|
||||
cost = 50
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Experimental energy gear crate"
|
||||
access = access_armory
|
||||
|
||||
@@ -591,7 +591,7 @@
|
||||
"/obj/item/clothing/head/helmet/riot",
|
||||
"/obj/item/clothing/suit/armor/riot")
|
||||
cost = 35
|
||||
containertype = "/obj/structure/crate/secure"
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Experimental armor crate"
|
||||
access = access_armory
|
||||
|
||||
@@ -602,7 +602,7 @@
|
||||
"/obj/machinery/deployable/barrier",
|
||||
"/obj/machinery/deployable/barrier")
|
||||
cost = 20
|
||||
containertype = "/obj/structure/crate/secure/gear"
|
||||
containertype = "/obj/structure/closet/crate/secure/gear"
|
||||
containername = "Secruity Barriers crate"
|
||||
|
||||
/datum/supply_packs/hats/
|
||||
@@ -632,7 +632,7 @@
|
||||
"/obj/item/clothing/head/collectable/petehat")
|
||||
name = "Collectable Hat Crate!"
|
||||
cost = 200
|
||||
containertype = "/obj/structure/crate/hat"
|
||||
containertype = "/obj/structure/closet/crate/hat"
|
||||
containername = "Collectable Hats Crate! Brought to you by Bass.inc!"
|
||||
|
||||
/datum/supply_packs/hats/New()
|
||||
|
||||
+68
-1
@@ -318,4 +318,71 @@
|
||||
return
|
||||
|
||||
attack_paw(mob/user as mob)
|
||||
return attack_hand(user)
|
||||
return attack_hand(user)
|
||||
|
||||
/obj/item/toy/waterflower
|
||||
name = "Water Flower"
|
||||
desc = "A seemingly innocent sunflower...with a twist."
|
||||
icon = 'harvest.dmi'
|
||||
icon_state = "sunflower"
|
||||
item_state = "sunflower"
|
||||
var/empty = 0
|
||||
flags = USEDELAY
|
||||
|
||||
/obj/item/toy/waterflower/New()
|
||||
var/datum/reagents/R = new/datum/reagents(10)
|
||||
reagents = R
|
||||
R.my_atom = src
|
||||
R.add_reagent("water", 10)
|
||||
|
||||
/obj/item/toy/waterflower/attack(mob/living/carbon/human/M as mob, mob/user as mob)
|
||||
return
|
||||
|
||||
/obj/item/toy/waterflower/afterattack(atom/A as mob|obj, mob/user as mob)
|
||||
|
||||
if (istype(A, /obj/item/weapon/storage/backpack ))
|
||||
return
|
||||
|
||||
else if (locate (/obj/structure/table, src.loc))
|
||||
return
|
||||
|
||||
else if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1)
|
||||
A.reagents.trans_to(src, 10)
|
||||
user << "\blue You refill your flower!"
|
||||
return
|
||||
|
||||
else if (src.reagents.total_volume < 1)
|
||||
src.empty = 1
|
||||
user << "\blue Your flower has run dry!"
|
||||
return
|
||||
|
||||
else
|
||||
src.empty = 0
|
||||
|
||||
|
||||
var/obj/effect/decal/D = new/obj/effect/decal/(get_turf(src))
|
||||
D.name = "water"
|
||||
D.icon = 'chemical.dmi'
|
||||
D.icon_state = "chempuff"
|
||||
D.create_reagents(5)
|
||||
src.reagents.trans_to(D, 1)
|
||||
playsound(src.loc, 'spray3.ogg', 50, 1, -6)
|
||||
|
||||
spawn(0)
|
||||
for(var/i=0, i<1, i++)
|
||||
step_towards(D,A)
|
||||
D.reagents.reaction(get_turf(D))
|
||||
for(var/atom/T in get_turf(D))
|
||||
D.reagents.reaction(T)
|
||||
if(ismob(T) && T:client)
|
||||
T:client << "\red [user] has sprayed you with water!"
|
||||
sleep(4)
|
||||
del(D)
|
||||
|
||||
return
|
||||
|
||||
/obj/item/toy/waterflower/examine()
|
||||
set src in usr
|
||||
usr << text("\icon[] [] units of water left!", src, src.reagents.total_volume)
|
||||
..()
|
||||
return
|
||||
@@ -41,7 +41,7 @@
|
||||
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
|
||||
icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
|
||||
product_paths = "/obj/item/weapon/reagent_containers/food/drinks/bottle/gin;/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey;/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla;/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka;/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth;/obj/item/weapon/reagent_containers/food/drinks/bottle/rum;/obj/item/weapon/reagent_containers/food/drinks/bottle/wine;/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac;/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/weapon/reagent_containers/food/drinks/ice"
|
||||
product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;8;30;10"
|
||||
product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;15;30;10"
|
||||
vend_delay = 15
|
||||
product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/tea"
|
||||
product_hideamt = "10"
|
||||
@@ -204,7 +204,7 @@
|
||||
desc = "A kitchen and restaurant equipment vendor"
|
||||
icon_state = "dinnerware"
|
||||
product_paths = "/obj/item/weapon/tray;/obj/item/weapon/kitchen/utensil/fork;/obj/item/weapon/kitchenknife;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/clothing/suit/chef/classic"
|
||||
product_amounts = "6;4;2;15;2"
|
||||
product_amounts = "8;6;3;8;2"
|
||||
//product_amounts = "8;5;4" Old totals
|
||||
product_hidden = "/obj/item/weapon/kitchen/utensil/spoon;/obj/item/weapon/kitchen/utensil/knife;/obj/item/weapon/kitchen/rollingpin;/obj/item/weapon/butch"
|
||||
product_hideamt = "2;2;2;2"
|
||||
|
||||
@@ -548,6 +548,8 @@
|
||||
w_class = 2.0
|
||||
throw_speed = 2
|
||||
throw_range = 5
|
||||
m_amt = 50
|
||||
g_amt = 20
|
||||
flags = TABLEPASS|USEDELAY|FPRINT|CONDUCT
|
||||
item_state = "coil_red"
|
||||
|
||||
@@ -782,7 +784,7 @@
|
||||
throwforce = 3.0
|
||||
throw_speed = 1
|
||||
throw_range = 5
|
||||
w_class = 3.0
|
||||
w_class = 2.0
|
||||
flags = FPRINT | TABLEPASS
|
||||
|
||||
|
||||
@@ -937,7 +939,7 @@
|
||||
icon = 'shards.dmi'
|
||||
icon_state = "large"
|
||||
desc = "Could probably be used as ... a throwing weapon?"
|
||||
w_class = 3.0
|
||||
w_class = 1.0
|
||||
force = 5.0
|
||||
throwforce = 15.0
|
||||
item_state = "shard-glass"
|
||||
|
||||
Reference in New Issue
Block a user