Commit Graph

44 Commits

Author SHA1 Message Date
Trilbyspaceclone f315250fc4 Update drinnerware.dm 2019-04-08 02:39:37 -04:00
Trilbyspaceclone 4772f12d54 Update drinnerware.dm 2019-04-07 19:52:48 -04:00
deathride58 dab87b1b43 Merge pull request #7909 from Trilbyspaceclone/patch-46
[Ready] Makes engivender more usefull and adds a few more coin items
2019-01-14 21:48:50 -05:00
Trilbyspaceclone 913de53760 Update engivend.dm 2019-01-13 01:42:11 -05:00
Trilbyspaceclone 6d9c76ce3a Update engivend.dm 2019-01-13 01:31:20 -05:00
Trilbyspaceclone 6701585888 Update snack.dm (#7899) 2019-01-08 02:35:19 -08:00
Trilbyspaceclone c2eafa3f73 Adds condiments to the coffie vender with coins! (#7902)
* Update coffee.dm

* Update coffee.dm

* Would help to double check
2019-01-08 02:28:24 -08:00
Trilbyspaceclone 79f4b77b4a Update engivend.dm 2019-01-07 21:27:23 -05:00
Trilbyspaceclone c50ca750d8 [Ready] Makes the YouTools and Vendomat more useful (#7870)
* Fixing updater

* Update youtool.dm

* Update assist.dm
2019-01-03 04:39:14 -08:00
Trilbyspaceclone 3b24774714 Buffs NanoMed Wall units! (#7794)
* removes some rouge things

* Kev wishes
2018-12-13 11:51:55 -08:00
Trilbyspaceclone 203906781c Cit change 2018-11-10 00:34:38 -05:00
Trilbyspaceclone 09752d4e2b Coin for headset with Engi access 2018-11-03 18:46:59 -04:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000 3abeb214fd Update _vending.dm 2018-08-20 14:57:31 -07:00
Unknown 761f2f931b tweaks 2018-08-09 10:16:15 +02:00
Unknown d6e6d0f70b Ports the lovely vending machine UI by Andrew Montagne from Oracle 2018-08-08 15:23:41 +02:00
deathride58 0235f37fd0 Merge pull request #7339 from Trilbyspaceclone/patch-3
Adds more to the Autodrobe coin slot!
2018-07-10 02:00:06 -04:00
Trilbyspaceclone 624351076e Update autodrobe.dm
Adds in more clothing for gimmicks or to look fancy! None of those outfits have any armor or usefulness other then to look good or cover your face if its a mask similar to the chicken hat
Why: These outfits look nice and have no real in-game affect for Power-gamers
2018-07-05 09:49:07 -04:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Jordan Brown 1ee84bb7d2 Merge pull request #38580 from Hyacinth-OR/pinkscarf
Adds a pink scarf
2018-06-19 09:49:28 -05:00
81Denton 241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
2018-06-18 09:37:48 -05:00
oranges 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-11 22:29:27 -05:00
81Denton e3f9229e08 Fixes Pubby maint boozeomat (#38300) 2018-06-06 02:36:34 -05:00
Jordan Brown 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay 69af2087aa Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
2018-05-27 01:32:02 -05:00
LetterJay db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -05:00
cyclowns f37865ee6c Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-22 22:11:23 -05:00
LetterJay c10c12596d Update boozeomat.dm 2018-05-20 03:18:24 -05:00
LetterJay 3d0f914a2c Merge pull request #6770 from Citadel-Station-13/upstream-merge-37869
[MIRROR] Adds Fernet, a digestif that reduces your satiety.
2018-05-19 09:15:46 -05:00
LetterJay 047fc2a858 Update boozeomat.dm 2018-05-17 23:45:11 -05:00
ThePainkiller e2bcf82341 Adds Fernet, a digestif that reduces your satiety. 2018-05-17 10:19:40 -05:00
Dax Dupont eb29d86c5f Fixes wrong circuits (#37853)
* Fixes wrong circuits

* this too
2018-05-16 12:04:54 -05:00
Jordan Brown 3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
LetterJay 3ce9fba8bf Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589
[MIRROR] Adds 5 new drinks
2018-05-13 11:52:12 -05:00
LetterJay 440d123972 Update boozeomat.dm 2018-05-13 10:16:04 -05:00
Firecage 694726e89d Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values. (#37683)
* removes the block chance from the Roman Shield.

* replaces the Roman Shield in the autodrobe with a toy version with no block chance.

* replaces the armoured roman helmets from the autodrobe with fake ones.
2018-05-09 00:49:19 -05:00
Hyacinth-OR 4a7f656823 Adds grenadine. 2018-05-02 13:13:29 -05:00
europax 2fe4591a12 Adds 5 new drinks 2018-05-01 13:42:48 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot bd3d76b8d3 [MIRROR] Modularises vending machines (#6050)
* Modularises vending machines

* Update vending_items.dm
2018-03-22 06:10:17 -05:00