d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
68083aa0c6
a
2019-07-25 21:43:02 -04:00
612021b9d5
h
2019-07-25 21:43:02 -04:00
f114094138
Merge pull request #8926 from Thalpy/Secbats
...
Secbats
2019-07-22 20:15:36 -07:00
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
75d6768ba7
Changed how the box works so it's not a storage.
2019-07-19 22:12:05 +01:00
4ab5060596
Adds secbats (tested)
2019-07-19 17:07:02 +01:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
31bd9104bb
Ports "Adds blueshirt items to sectech and defines them better."
2019-07-13 06:42:09 +02:00
cc39c9f896
Merge branch 'master' into master
2019-07-06 16:03:17 +01:00
3c2e03c247
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58
2019-07-04 23:46:04 +02:00
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01:00
937d6467e6
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
2019-06-30 19:16:27 +01:00
0371a5513a
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-06-29 06:03:57 +02:00
10109d0fe5
Merge branch 'pr/18'
2019-06-23 19:15:07 +01:00
41eee65b15
Merge branch 'master' into master
2019-06-17 12:18:40 +01:00
1cc0724519
Merge branch 'master' into Dwarf
2019-06-17 12:09:55 +01:00
1323ace579
Peanuts, peanut butter, and sandwiches.
2019-06-17 05:17:24 +02:00
7c59349ad3
Update medical.dm
2019-06-09 12:02:16 -04:00
f44b9048af
Added to vendors/tech.
2019-06-08 01:00:51 +01:00
79a7b6b45b
Fixes.
2019-05-27 20:25:57 +01:00
91f10442cf
Merge branch 'pr/12'
2019-05-26 02:05:48 +01:00
a9eca3c143
Update clothesmate.dm
2019-05-16 15:51:46 -04:00
65dfca1c18
Update wardrobes.dm
2019-05-16 15:44:59 -04:00
246a344fed
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
2019-05-16 00:58:30 +01:00
f7655cad25
All compiling errors fixed, except for a few weird ones that I need help
2019-05-11 15:40:06 +01:00
f315250fc4
Update drinnerware.dm
2019-04-08 02:39:37 -04:00
4772f12d54
Update drinnerware.dm
2019-04-07 19:52:48 -04:00
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
913de53760
Update engivend.dm
2019-01-13 01:42:11 -05:00
6d9c76ce3a
Update engivend.dm
2019-01-13 01:31:20 -05:00
6701585888
Update snack.dm ( #7899 )
2019-01-08 02:35:19 -08:00
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
79f4b77b4a
Update engivend.dm
2019-01-07 21:27:23 -05:00
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
3b24774714
Buffs NanoMed Wall units! ( #7794 )
...
* removes some rouge things
* Kev wishes
2018-12-13 11:51:55 -08:00
203906781c
Cit change
2018-11-10 00:34:38 -05:00
09752d4e2b
Coin for headset with Engi access
2018-11-03 18:46:59 -04:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
3abeb214fd
Update _vending.dm
2018-08-20 14:57:31 -07:00
761f2f931b
tweaks
2018-08-09 10:16:15 +02:00
d6e6d0f70b
Ports the lovely vending machine UI by Andrew Montagne from Oracle
2018-08-08 15:23:41 +02:00
0235f37fd0
Merge pull request #7339 from Trilbyspaceclone/patch-3
...
Adds more to the Autodrobe coin slot!
2018-07-10 02:00:06 -04:00
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
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
1ee84bb7d2
Merge pull request #38580 from Hyacinth-OR/pinkscarf
...
Adds a pink scarf
2018-06-19 09:49:28 -05:00
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
1d0f775f56
Merge pull request #38360 from ShizCalev/key-cleanup
...
Cleans up some logging
2018-06-11 22:29:27 -05:00
Fermi