 izac112
|
f3e3905b41
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
|
2024-12-11 20:18:19 +01:00 |
|
|
Killian
|
ef78be37ce
|
space traffic updates
|
2024-12-08 08:00:55 +00:00 |
|
|
Killian
|
525905a086
|
traffic updates
|
2024-12-06 22:19:57 +00:00 |
|
|
Killian
|
553675edf5
|
Merge branch 'master' into kk-spacetraffic
|
2024-12-06 20:45:06 +00:00 |
|
|
Heroman3003
|
5092af9321
|
Merge pull request #16672 from Kashargul/areaStuff
converts area booleans to flags
|
2024-12-07 05:20:02 +10:00 |
|
|
Heroman3003
|
9941ffa8dc
|
Merge branch 'master' into areaStuff
|
2024-12-07 05:14:52 +10:00 |
|
|
Heroman3003
|
619364a073
|
Merge branch 'master' into headset
|
2024-12-07 05:13:21 +10:00 |
|
|
Heroman3003
|
a827a8b5b2
|
Merge pull request #16667 from Kashargul/appearance
rework appearance changer
|
2024-12-07 05:07:30 +10:00 |
|
|
Heroman3003
|
146c3f4140
|
Merge pull request #16659 from TheCaramelion/Viro-Update-1
Virology Update 1
|
2024-12-07 05:06:20 +10:00 |
|
|
Heroman3003
|
edd99b63cf
|
Merge pull request #16639 from KillianKirilenko/kk-charpod
"Maint Lurker" Hole
|
2024-12-07 05:05:22 +10:00 |
|
|
Heroman3003
|
6253051c21
|
Merge pull request #16598 from Kashargul/protRig
Prot rig up port
|
2024-12-07 05:04:29 +10:00 |
|
|
Heroman3003
|
60fd487c76
|
Merge pull request #16655 from Kashargul/jobtitle
tragedian gets its name back
|
2024-12-07 05:04:05 +10:00 |
|
|
izac112
|
0fa0bc3ed0
|
Fixes
|
2024-12-06 00:25:08 +01:00 |
|
|
ShadowLarkens
|
9a940834b4
|
Enable creation of cycling airlocks
|
2024-12-04 13:45:19 -08:00 |
|
|
Kashargul
|
ead0180057
|
converts area vars to flags
|
2024-12-04 22:21:38 +01:00 |
|
|
izac112
|
68e5bf9d42
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
|
2024-12-04 15:21:21 +01:00 |
|
|
izac112
|
02aea97e36
|
changes
|
2024-12-04 15:18:34 +01:00 |
|
|
izac112
|
87ce13b27c
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
|
2024-12-04 15:17:00 +01:00 |
|
|
Killian
|
6306e5b6ca
|
Update event_vr.dm
|
2024-12-04 12:53:11 +00:00 |
|
|
Killian
|
01813cd4d0
|
maint lurker setup
|
2024-12-04 12:22:40 +00:00 |
|
|
Killian
|
2e91c505c3
|
Update event_vr.dm
|
2024-12-04 09:28:49 +00:00 |
|
|
Killian
|
36ddfae1ab
|
Merge branch 'kk-charpod' of https://github.com/KillianKirilenko/VOREStation into kk-charpod
|
2024-12-04 09:27:16 +00:00 |
|
|
Killian
|
e937788c58
|
Update event_vr.dm
fix up spans for the other pods, some other minor adjustments
|
2024-12-04 09:27:02 +00:00 |
|
|
Killian
|
001afdfbc5
|
Merge branch 'master' into kk-charpod
|
2024-12-04 09:25:02 +00:00 |
|
|
Kashargul
|
9cb06747fb
|
some robot interacts for closeby things
|
2024-12-04 01:49:13 +01:00 |
|
|
Kashargul
|
725689ad55
|
fix that here too
|
2024-12-03 20:33:49 +01:00 |
|
|
Kashargul
|
798589a4de
|
.
|
2024-12-03 11:21:55 +01:00 |
|
|
Kashargul
|
5febd2f97f
|
fix multiple headsets
|
2024-12-03 11:17:44 +01:00 |
|
|
Kashargul
|
90c2d09e8e
|
also fix that
|
2024-12-02 23:22:21 +01:00 |
|
|
Killian
|
e9aafd2826
|
Merge remote-tracking branch 'upstream/master' into kk-spacetraffic
|
2024-12-02 06:08:55 +00:00 |
|
|
Killian
|
9d3a7986d8
|
traffic update
more khi cleanup
|
2024-12-01 18:37:08 +00:00 |
|
|
izac112
|
a2ad915045
|
Device and weapon
|
2024-12-01 00:56:26 +01:00 |
|
|
izac112
|
058f219cb9
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
|
2024-11-30 23:30:26 +01:00 |
|
|
Kashargul
|
56c53e72fe
|
Merge branch 'master' into protRig
|
2024-11-30 15:00:57 +01:00 |
|
|
Heroman3003
|
f5f707030c
|
Merge pull request #16506 from Darlantanis/RecordSaving
Ports in-round record updating
|
2024-11-30 14:42:17 +10:00 |
|
|
Heroman3003
|
a15578d8fd
|
Merge pull request #16597 from Kashargul/miscGripper
up ports misc gripper, gargoyle, petrification, some message fixes
|
2024-11-30 14:41:36 +10:00 |
|
|
Heroman3003
|
96cd99127a
|
Merge pull request #16618 from ShadowLarkens/ui
Kitchen UI Update
|
2024-11-30 14:41:27 +10:00 |
|
|
Heroman3003
|
90dc2821e9
|
Merge pull request #16649 from ShadowLarkens/microwave_improvemenets
Make the microwave preview what it'll (probably) create
|
2024-11-30 14:40:36 +10:00 |
|
|
Guti
|
823db69af5
|
Merge branch 'master' into Viro-Update-1
|
2024-11-29 22:56:42 +01:00 |
|
|
Kashargul
|
c26c9047ef
|
tragedian gets its name back
|
2024-11-29 19:59:50 +01:00 |
|
|
Kashargul
|
07958d0657
|
Merge branch 'master' into protRig
|
2024-11-28 15:57:44 +01:00 |
|
|
Killian
|
7a987e3a40
|
Update engineering.dm
|
2024-11-28 05:04:21 +00:00 |
|
|
Heroman3003
|
f552b4bdde
|
Merge pull request #16624 from Kashargul/RS_Ports
Ports RS 658, 661 and some minor things
|
2024-11-28 14:39:22 +10:00 |
|
|
Heroman3003
|
121532e26c
|
Merge pull request #16622 from Darlantanis/MapUpgrades
Ports map upgradable machinery framework, map upgradable SMES's
|
2024-11-28 14:38:51 +10:00 |
|
|
Heroman3003
|
8d675e86e7
|
Merge pull request #16616 from Kashargul/things
some accessories
|
2024-11-28 14:38:12 +10:00 |
|
|
Kashargul
|
2fdde73d3a
|
Merge branch 'master' into protRig
|
2024-11-27 23:58:52 +01:00 |
|
|
Kashargul
|
938ab8af7c
|
Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects
|
2024-11-27 23:53:06 +01:00 |
|
|
Killian
|
c00e6f3d4d
|
Merge remote-tracking branch 'upstream/master' into kk-charpod
|
2024-11-27 20:37:02 +00:00 |
|
|
Heroman3003
|
05b28bac9e
|
Merge pull request #16647 from Cameron653/Janihud-OP
Ports Janihud rework from Outpost 21.
|
2024-11-28 06:05:21 +10:00 |
|
|
Heroman3003
|
6f020343bb
|
Merge pull request #16650 from Heroman3003/thanksgivingturkey
Adds a turkey mob and reworks regular Turkey recipe
|
2024-11-28 05:53:12 +10:00 |
|