07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
637576848e
TGUI PDAs Finale (minus newscaster)
2020-09-16 21:31:50 -07:00
bec0942513
TGUI PDAs, legacy code to-be-removed
2020-09-16 21:31:50 -07:00
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
dd4f9c9967
TGUI NTOS - Total Conversion
2020-09-05 17:02:58 -07:00
ffdd8de3ce
Site Management lookover for _vr stuff
2020-08-29 05:22:52 +10:00
10ca73bc6e
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576
2020-08-28 13:30:54 -04:00
57bc515c04
Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases
2020-08-27 22:28:46 -04:00
21c1b12ef1
Colony Director -> Site Manager
2020-08-27 20:43:04 -04:00
c4dad2dce6
Merge branch 'master' into master
2020-08-09 22:33:07 -04:00
f00fdebbb9
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
...
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
21788f3cab
Reaads supply demand
2020-08-07 01:37:47 +02:00
43b9196ff6
Disables aurora caelus
2020-08-07 01:17:27 +02:00
aab53de9f6
Update spider_migration_yw.dm
2020-08-05 23:41:34 -04:00
6a8dfc640e
Fixing anouncement
...
Fixes spider anouncements
2020-08-05 22:42:48 -04:00
601a155b30
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
3ea0e50432
Port TGUI Wire datums ( ParadiseSS13/Paradise#13769 )
2020-07-22 00:23:58 -07:00
da44a8bf0b
Fix hangar locations
...
Forgot to increase numerically
2020-07-16 20:04:31 -07:00
1f1bd87509
Fix Hangar Locations
...
Forgot to increase numerically
2020-07-16 20:03:28 -07:00
abc6b8ad2b
Disables Aurora Caelus event
2020-07-15 03:28:08 -04:00
8e47132edc
Mutants event
...
This is more of a blank commit to kick Travis
2020-07-14 16:50:41 -07:00
3fc88dee58
Mutant event control files
2020-07-14 15:37:30 -07:00
1456af50f7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-14 00:21:02 +02:00
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
22880f526d
Voreupdate
2020-07-02 15:39:00 +02:00
fd4cda0ce8
Stops repeating grub udio message
2020-06-26 17:54:49 -04:00
ad540c6e05
Merge pull request #7298 from TheFurryFeline/TFF-Solar_Storm_Typo_Fixy
...
Hoorah. More Typo Fixy
2020-06-22 15:16:48 -04:00
6d3a0c6298
Update aurora_caelus.dm
2020-06-16 08:36:44 -04:00
99db1990bc
Add the Aurora Caelus Event!
2020-06-16 03:29:26 -04:00
606b7ec8e5
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-12 21:34:20 +02:00
a7024c468f
Increases Aurora Caelus rarity
2020-06-10 15:13:47 -04:00
7ad2832f14
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-08 21:49:14 +02:00
ad7ad8dbf5
Add Aurora Caelus Event!
...
Adds the Aurora Caelus, a rare event that occurs on the station space z-levels~!
During this event a .ogg will play to all clients, and you will see the outside appear almost like a storm (this is a placeholder, I need assistance from spriters to make something like an aurora or help edit the ion-storm placeholder I'm using) no longer placeholder! - consider it a fun little break and a rare/silly event.
The event announces as soon as it fires, and assuming time dilation isn't horrible, starts 10 seconds after (5 "ticks" of the event subsystem being fired by the MC).
Current event weight (frequency) can be tweaked according to admin liking, and it's currently a MUNDANE level event. This can be changed to MODERATE or otherwise as determined by admins, or given a higher weight - during testing, stuff like PDA spam or news or etc very often went over it and it took giving it a lot of weight for it to fire - but it is supposed to be a "rare" cosmic thing, not something that happens every shift.
This also resets the commit history for one clean commit.
2020-06-05 22:52:28 -04: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
bba0a05f5f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-13 10:21:49 +02:00
96da7be01b
Put APCs and SMESes into GLOB lists to ease iteration
2020-05-11 22:05:41 -04:00
2b3fc9a740
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-11 18:20:43 +02:00
8476073790
Merge pull request #334 from CHOMPStation2/May2020UpstreamPull
...
May2020 upstream pull
2020-05-09 21:58:55 -07:00
ef06089498
Update event_container_vr.dm
2020-05-09 17:52:54 -07:00
323f7e651f
Fix/rename some timing stuff
2020-05-08 01:51:52 -04:00
48644315c6
Update event_container_vr.dm
2020-05-07 02:07:08 -07:00
81ad690b89
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull
2020-05-06 22:36:01 -07: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
5a2b073283
Update grubinfestation_vr.dm
2020-05-06 05:08:38 -07:00
02ba08936d
Update grubinfestation_vr.dm
2020-05-06 04:54:06 -07:00
959f5a6fd1
Update grubinfestation_vr.dm
2020-05-06 04:42:04 -07:00
c6d197eb8b
Update grubinfestation_vr.dm
2020-05-06 04:29:25 -07:00
Cadyn