cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 22:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,355 Commits 8 Branches 26 Tags
5a42a3a76e2d3909074cee7597fc015eb42e1435
Commit Graph

37565 Commits

Author SHA1 Message Date
Aronai Sieyes
5a42a3a76e Merge pull request #7721 from VOREStation/upstream-merge-7099 
[MIRROR] Rewrite airlock electronics
 2020-05-08 16:07:26 -04:00
Aronai Sieyes
f8fa0c09cf Update airlock_electronics.dm 2020-05-08 15:53:32 -04:00
Atermonera
e02fc2550a Rewrite airlock electronics 2020-05-08 15:20:47 -04:00
Atermonera
40f1198e12 Merge pull request #7059 from atlantiscze/2020_04_28_DelamChange 
Supermatter delamination tweaks
 2020-05-08 15:18:27 -04:00
Aronai Sieyes
5f8ce48793 Merge pull request #7710 from VOREStation/upstream-merge-7064 
[MIRROR] Adds preference to control multilingual behaviour
 2020-05-08 14:55:46 -04:00
Aronai Sieyes
069b8829ad Update say.dm 2020-05-08 14:44:54 -04:00
Aronai Sieyes
7f29eef910 Merge pull request #7708 from VOREStation/upstream-merge-7101 
[MIRROR] Fixes Promethean Language
 2020-05-08 14:43:33 -04:00
Aronai Sieyes
92c3cf7345 Merge pull request #7706 from VOREStation/aro-holohear 
Prevent holopad chat from going to lobby
 2020-05-08 14:43:22 -04:00
Aronai Sieyes
aee55fbd00 Merge pull request #7705 from VOREStation/aro-lessrude 
Make multikey warning less rude
 2020-05-08 14:43:12 -04:00
Aronai Sieyes
652c9a2049 Merge pull request #7703 from VOREStation/aro-telenano 
Redo teleporters to use nanoui
 2020-05-08 14:42:52 -04:00
Aronai Sieyes
e94976288e Merge pull request #7709 from VOREStation/aro-orbits 
Fix very curious orbit offset issue (513?)
 2020-05-08 14:42:42 -04:00
Aronai Sieyes
f3bd738ee9 Merge pull request #7711 from VOREStation/aro-timing 
Fix/rename some timing stuff
 2020-05-08 14:42:32 -04:00
Aronai Sieyes
b9a4370bd2 Merge pull request #7712 from VOREStation/aro-vehiclehelp 
Add some ctrl/alt vehicle helper clicks
 2020-05-08 14:42:00 -04:00
Aronai Sieyes
36946917e4 Merge pull request #7713 from VOREStation/aro-demeson 
When looking at machines, don't allow mesons/material/etc
 2020-05-08 14:41:52 -04:00
Aronai Sieyes
31f9a9d7d6 Merge pull request #7715 from VOREStation/aro-nifcopy 
Don't copy NIF when you copy characters
 2020-05-08 14:41:44 -04:00
Aronai Sieyes
fe3d6094cd Merge pull request #7718 from VOREStation/aro-jointestrefac 
Refactor spawn_checks_vr and when it is called
 2020-05-08 14:41:36 -04:00
Aronai Sieyes
dd3d4f4cfe Refactor spawn_checks_vr and when it is called 2020-05-08 13:34:31 -04:00
Aronai Sieyes
00bda74f95 Check power on machine build 2020-05-08 13:00:40 -04:00
Aronai Sieyes
de46f1a152 Don't copy NIF when you copy characters 2020-05-08 12:21:25 -04:00
Aronai Sieyes
1acfafd62f When looking at machines, don't allow mesons/material/etc 2020-05-08 11:13:20 -04:00
Aronai Sieyes
c849c020b9 Add some ctrl/alt vehicle helper clicks 2020-05-08 10:53:08 -04:00
Arokha Sieyes
6d47c2f95c Further time fixes 2020-05-08 10:09:40 -04:00
Arokha Sieyes
323f7e651f Fix/rename some timing stuff 2020-05-08 01:51:52 -04:00
Atermonera
ee07d117f2 Adds preference to control multilingual behaviour 2020-05-08 00:43:57 -04:00
Aronai Sieyes
6dc177ebc7 Fix very curious orbit offset issue (513?) 2020-05-07 22:23:28 -04:00
Atermonera
82f8293b25 Merge pull request #7101 from MisterLayne/prommie-lang-fix 
Fixes Promethean Language
 2020-05-07 21:38:43 -04:00
Aronai Sieyes
67c8945a66 Prevent holopad chat from going to lobby 2020-05-07 21:34:21 -04:00
Aronai Sieyes
84ed809604 Make multikey warning less rude 2020-05-07 21:29:10 -04:00
Aronai Sieyes
adcc8047d6 Redo teleporter control in nanoui 2020-05-07 21:10:58 -04:00
Aronai Sieyes
1dd9f2cc12 Merge pull request #7699 from VOREStation/aro-borgjobs 
Refactor some AI/borg join stuff
 2020-05-07 19:59:44 -04:00
Aronai Sieyes
800cc4176e Merge pull request #7701 from Nepoox/bogensimp 
Fixes Rosey's pentatail
 2020-05-07 19:52:54 -04:00
Aronai Sieyes
393366a825 Refactor job joins for noncarbons 2020-05-07 19:48:25 -04:00
Aronai Sieyes
f09a9a9a26 Merge pull request #7682 from VOREStation/upstream-merge-7055 
[MIRROR] Updates machines to use default_apply_parts()
 2020-05-07 19:24:13 -04:00
Nepox
942054ad66 I dont want to do this anymore 
Please
 2020-05-07 23:27:48 +02:00
Nepox
3755762277 Fixes Rosey's pentatail 
Attempt 2: Electric Bogaloo. This time hopefully without undoing newer changes. 

Tail is now colorable. I hope.
 2020-05-07 22:40:58 +02:00
Aronai Sieyes
55718b6ca5 Merge pull request #7694 from Rykka-Stormheart/shep-dev-reset-slot 
Fix for Resetting Character Slot to Default
 2020-05-07 10:35:16 -04:00
Aronai Sieyes
c565ad8bb5 Update telecomunications.dm 2020-05-07 10:30:02 -04:00
Aronai Sieyes
074055cd80 Update autolathe.dm 2020-05-07 10:28:41 -04:00
Rykka
baa3de91f0 Fix for Resetting Character Slot to Default 
Resets the character slot to default.
Fixes https://github.com/VOREStation/VOREStation/issues/7693

Credit goes to Shadow Larkens for helping me figure it out.
 2020-05-07 08:58:13 -04:00
Atermonera
c42e536074 Merge pull request #7088 from VOREStation/pol-smesexamine 
Fix SMES and debug power item examine messages
 2020-05-07 02:00:11 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai Sieyes
c3e820165b Fix species with slowdown instead being super fast 2020-05-07 00:18:54 -04:00
Aronai Sieyes
ae303cd122 Merge pull request #7676 from VOREStation/aro-bicon2 
Refactor examining and some of getFlatIcon
 2020-05-06 23:21:41 -04:00
Aronai Sieyes
939105952a "Deg" instead of symbol 2020-05-06 23:11:29 -04:00
Aronai Sieyes
db8184db0a Merge pull request #7677 from VOREStation/aro-goonpush 
Add Goon-style pushing of objects
 2020-05-06 22:55:15 -04:00
Aronai Sieyes
eca9efcd31 Merge pull request #7678 from VOREStation/aro-airadiohelp 
Two AI QoL tweaks for intercom use
 2020-05-06 22:54:23 -04:00
Aronai Sieyes
1d3ed1441c Merge pull request #7675 from Little-119/NightshiftOverride 
Add a better nightshift control
 2020-05-06 22:51:57 -04:00
Aronai Sieyes
4258bf5c8c Merge pull request #7673 from VOREStation/aro-steppies 
Don't step on people who are riding you
 2020-05-06 22:51:23 -04:00
Aronai Sieyes
ab0f256c64 Add ctrl/alt quick click functions on intercoms for AI 2020-05-06 21:34:01 -04:00
Aronai Sieyes
8cc4a53477 Increase intercom range to world.view 2020-05-06 21:34:01 -04:00