07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
d49640431d
Merge pull request #9062 from ShadowLarkens/tgui_finale
...
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
95ff8c2080
Tweaks to pickup/equip sounds.
2020-09-20 06:57:07 -04:00
d9d3bc61f3
Quickfix for fax machines not working
2020-09-20 02:45:04 -07:00
375e178046
TGUI Photocopier & Guest Pass
2020-09-20 00:07:09 -07:00
ca60db08aa
TGUI Fax Machine
2020-09-19 22:36:34 -07:00
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
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
28c19ee066
Merge pull request #8868 from VOREStation/upstream-merge-7571
...
[MIRROR] Colony Director -> Site Manager
2020-08-28 13:17:58 -04:00
21c1b12ef1
Colony Director -> Site Manager
2020-08-27 20:43:04 -04:00
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
48af4c881c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
89b0fa6b79
Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch
...
Persistence Patch
2020-08-21 01:14:04 -04:00
0231088057
TGUI Notice Board
2020-08-16 22:27:08 -07:00
ad6870c78d
Persistence Patch
...
- Fixes Paper and font tags stacking across rounds, as shown in: 
- Fixes Graffiti being persistent for over 50 rounds (10+ days)
- Sets Trash to be persistent for 4 rounds instead of 5
- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained:
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it
- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.
Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.
2020-08-16 09:48:46 -04:00
5c02633707
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-13 20:01:22 +02:00
6215434bc3
TGUI File Cabinets
2020-08-11 06:31:29 -07:00
81871a960e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-10 21:50:42 +02:00
f00fdebbb9
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
...
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
91587c6904
Merge pull request #7398 from Cerebulon/stickyfixy
...
Stickynote tweaks
2020-08-08 23:50:23 -04:00
b5a8a6944c
Fax machine comments
...
(Feed me paper)
2020-07-27 18:26:35 -04:00
601a155b30
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
8b031dd8ad
Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 05:24:56 -04:00
5daabf8c0c
Unity Hound Parts
2020-07-22 23:10:51 -04:00
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
d76589b9e9
Revert "Revert "Fixes some events, removes unused scripts related to TGS3, etc""
2020-07-09 18:00:20 +02:00
3cb9892fbc
Revert "Fixes some events, removes unused scripts related to TGS3, etc"
2020-07-09 14:54:48 +02:00
1845eed3cc
Fixes some events, removes unused scripts related to TGS3, etc
2020-07-07 20:04:03 -04:00
69d16539a1
Fixed the fax machin on local testing server
2020-05-24 14:13:22 +02:00
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
a964a3a1bc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 23:26:52 +02:00
bbb084a354
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 09:06:27 +02:00
d14a15ec6f
Merge pull request #7144 from Cyantime/patch-1
...
Allows fax machine toner replacement
2020-05-15 21:06:50 -04:00
e29648e47c
Add some placeholders so they can at least get furry/scaley butts.
2020-05-13 06:28:00 -04:00
fd656e06dd
Tweaks to Photocopier, Adjust NanoUI, and allow Butt Photocopying!
...
You can photocopy your ass!
It will use 10 toner per (original) photo, and will use your base species!
If you're a custom species and have icon set to Vulpkanin, for instance, it will use the vulp ass. Werewolves will use the vulp for now, pending a thicc'er sprite.
Xenos + Xenohybrid will use THICC XENOS ASS sprites.
Xenochimera will work the same as custom species, using the base species ass.
The rest of the species not currently implemented (that is, those without sprites) will print a generic human butt. If you'd like custom sprites, sprite an ass, and put it in butts_vr.dmi
Improvements to photocopiers will be pushed forward to Polaris.
You can also tell precisely who's ass it is on the photo by clicking on it.
I'd still like to add the option to recolor the sprite based on your body color, but for now, it's a black/white ass. Sorry!
2020-05-13 06:20:44 -04:00
bba0a05f5f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-13 10:21:49 +02:00
d4cfdcfb3a
Switch to using GLOB.admins instead of admins
2020-05-12 11:16:54 -04:00
2b3fc9a740
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-11 18:20:43 +02:00
d075ca533c
Update folders.dm
2020-05-09 21:17:07 -07:00
5148a5f4b8
Update folders.dm
2020-05-07 16:45:13 -07:00
9c32a0e2b3
Updates machines to use default_apply_parts()
2020-05-07 00:40:34 -04:00
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02:00
8216144ab9
Add cooldown to pen clicks
...
Fixes https://github.com/VOREStation/VOREStation/issues/7000
2020-05-04 23:06:38 -04:00
6ebd249748
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
e81ac515b7
Reverts stamps and folder to use old sprite
2020-04-17 19:16:46 -03:00
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
de621558c3
Update adminpaper.dm
2020-04-14 17:07:21 -04:00
Cadyn
