Nadyr
c19d6812a7
powder that makes you say yes
2021-08-25 22:51:50 -04:00
Nadyr
2797027a41
Merge branch 'master' into upstream-merge-11426
2021-08-25 22:49:43 -04:00
Nadyr
f19dc1b2eb
Merge pull request #2874 from cadyn/upstream-merge-11421
...
Merge Upstream Pull Request 11421
2021-08-25 22:38:53 -04:00
Aronai Sieyes
af8d866e1b
Upstream-11426
2021-08-24 21:10:42 -07:00
Aronai Sieyes
72f5e790db
Upstream-11421
2021-08-24 21:10:20 -07:00
Nadyr
88ea62510a
Merge branch 'master' into upstream-merge-11459
2021-08-24 23:23:57 -04:00
Nadyr
b2c7a0f527
Merge pull request #2856 from CHOMPStationBot/upstream-merge-11441
...
[MIRROR] Fulpstation Labcoats
2021-08-24 23:22:01 -04:00
Nadyr
0e02aebc56
powder that makes you say yes
2021-08-24 22:43:18 -04:00
Nadyr
62d01c26da
powder that makes you say yes
2021-08-24 22:41:30 -04:00
Nadyr
0d69fcb7db
powder that makes you say yes
2021-08-24 20:44:37 -04:00
Chompstation Bot
7957f049af
Fulpstation Labcoats
2021-08-25 00:00:09 +00:00
Chompstation Bot
e209b4cfb2
Adds winter coats to their respective lockers/vendors
2021-08-24 23:59:02 +00:00
Chompstation Bot
6f129e8dc2
Port some more clothes from CitRP + updates 'off' sprite for mesons & co to match new style.
2021-08-24 23:58:34 +00:00
Chompstation Bot
4090222cda
Janitor Equipment Fix
2021-08-01 14:45:35 +00:00
Aronai Sieyes
89d2dfb34c
Merge pull request #11299 from GhostActual/janitor
...
Fixes Job Vendors
2021-07-29 20:10:26 +00:00
Chompstation Bot
02af50470c
7/23/2021 Drink Revamp
2021-07-27 22:06:30 +00:00
Ghost Actual
50c2de86d2
7/22/2021 Food Revamp ( #11210 )
...
* Base Commit
* Forgot the New Chips
* Forgot Chicken Fillet
* Base Commit
* Forgot the New Chips
* Forgot Chicken Fillet
* Conflict Fix
* Oopsie
* Fixes known issues
* Uploads Files for Remote Work
* Small Fix
* Final Commit (hopefully)
* Small Fix
2021-07-26 16:51:23 +00:00
Chompstation Bot
6df9089784
Adds medical kiosk to code/buildable
2021-07-25 22:02:18 +00:00
Chompstation Bot
15cafbe65b
Optimize a couple things
2021-07-20 21:30:20 +00:00
Chompstation Bot
481c0e314e
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
Chompstation Bot
b974746755
Add a lot of clothes/armor/suits/spacesuits/rigs
2021-07-14 22:44:11 -04:00
Chompstation Bot
287a5deee3
Use material defines more
2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf
Converts visible_message notice spans to look more like emotes
2021-07-05 20:30:12 +00:00
Razgriz
18d0faf82e
Merge pull request #2371 from CHOMPStationBot/upstream-merge-10832
...
[MIRROR] Have vendors be more tidy list-wise
2021-07-03 16:53:30 -07:00
Razgriz
1a3c753f4a
Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802
...
[MIRROR] Port several foods and food sprites
2021-07-03 14:49:34 -07:00
Aronai Sieyes
ce296636f7
Merge pull request #10832 from VOREStation/Arokha/vendlists
...
Have vendors be more tidy list-wise
2021-07-03 21:16:30 +00:00
Aronai Sieyes
ecc9cf97df
Merge pull request #10806 from VOREStation/Icons/vendors
...
Port Eris, /tg/ vendors
2021-07-03 20:32:22 +00:00
Aronai Sieyes
64db1a458b
Merge pull request #10802 from VOREStation/Icons/food
...
Port several foods and food sprites
2021-07-03 20:31:07 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c
[MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-22 22:17:02 +00:00
Aronai Sieyes
ac00965e68
cock
2021-06-19 22:03:38 -07:00
Chompstation Bot
55e3dc7904
Port current /tg/ lighting system
2021-06-18 04:23:09 +00:00
Chompstation Bot
20e3b0a2d3
[MIRROR] Linter Introduction + Cleanup
2021-05-27 16:31:50 +00:00
Chompstation Bot
2b3041e7b6
[MIRROR] Wall-mounted Geiger Counters
2021-05-23 22:27:56 +00:00
Novacat
5d69f8878d
Merge pull request #10373 from ShadowLarkens/fix_vending
...
Initialize all vending products on server start & fix multiple food icons
2021-05-22 03:50:10 +00:00
Novacat
d9fb7b0a42
Merge pull request #10368 from VOREStation/upstream-merge-8083
...
[MIRROR] Food 4 thought
2021-05-21 20:00:24 +00:00
Nadyr
00d855cbe4
Update vending.dm
2021-05-10 07:20:54 -04:00
Chompstation Bot
ca996648dd
[MIRROR] Oops, I refactored Chemistry!
2021-05-08 23:59:34 -04:00
Chompstation Bot
fd5b2f094f
[MIRROR] Moves material stacks to modules/materials
2021-04-28 16:38:58 +00:00
Novacat
f2fc4c8be7
Merge pull request #9960 from VOREStation/upstream-merge-7974
...
[MIRROR] Added Doctress' Jager drink.
2021-03-18 14:40:00 +00:00
Novacat
f7cfa0232f
Merge pull request #9426 from VOREStation/upstream-merge-7774
...
[MIRROR] Prevents infinite money
2020-12-08 03:34:59 +00:00
Cadyn
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
ShadowLarkens
3f191e4204
NanoUI Goes To Brazil
2020-09-20 02:36:46 -07:00
ShadowLarkens
34b5ffd1ac
TGUI Accounts Terminal
2020-09-19 22:09:06 -07:00
izac112
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
ShadowLarkens
c32f05e1f7
TGUI Civilian
...
UI's Converted:
- Aurora Cooking
- Chaplain Book Selection
- ColorMate
- Cryo Storage
- Holodeck
- Jukebox
- Looking Glass
- Microwave
- Newscasters
- Timeclock
- Vending Machine Improvements
2020-09-02 13:32:42 -07:00
Heroman
17d681c109
Changes the dates of bank account creation to be more reasonable
2020-08-30 13:57:21 +10:00
Rykka
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
Razgriz
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
