Cadyn
|
07775449d7
|
Fixing conflicts
|
2020-10-05 18:10:53 -07: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 |
|
izac112
|
e684df5236
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
|
2020-05-21 21:17:58 +02:00 |
|
Aronai Sieyes
|
09074eaabb
|
Alter playsound paradigm
|
2020-05-18 23:42:15 -04:00 |
|
Repede
|
e44e346352
|
Release Update
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
# Conflicts:
# code/__defines/machinery.dm
# code/controllers/configuration.dm
# code/game/jobs/jobs.dm
# code/game/machinery/doors/blast_door.dm
# code/game/machinery/pipe/pipe_recipes.dm
# code/game/objects/items/devices/radio/radio_vr.dm
# code/modules/client/preferences_vr.dm
# code/modules/clothing/glasses/hud_vr.dm
# code/modules/clothing/under/accessories/accessory_vr.dm
# code/modules/events/event_container_vr.dm
# code/modules/gamemaster/actions/planet_weather_change.dm
# code/modules/projectiles/guns/energy/netgun_vr.dm
# code/modules/projectiles/guns/energy/protector_vr.dm
# code/modules/vore/appearance/sprite_accessories_taur_vr.dm
# code/modules/vore/appearance/sprite_accessories_vr.dm
# code/modules/vore/fluffstuff/custom_guns_vr.dm
# icons/obj/power.dmi
# vorestation.dme
|
2020-04-16 21:07:33 -04:00 |
|
Aronai Sieyes
|
2ae64859cc
|
VS: Add a couple more views to the emagged looking glass console
|
2020-04-06 12:11:03 -04:00 |
|
Repede
|
78dd1b0ea8
|
final fixes and tweaks with upstream update and shuttles
|
2020-04-05 02:25:10 -04:00 |
|
Aronai Sieyes
|
307bea35d9
|
Fix console html tag
|
2020-04-03 00:17:39 -04:00 |
|
Aronai Sieyes
|
e39494a87f
|
VS: Vorey holodeck things
|
2020-04-02 23:43:13 -04:00 |
|
Aronai Sieyes
|
74134e4ac9
|
Looking Glass Holodecks
|
2020-04-02 23:42:47 -04:00 |
|