izac112
|
bba0a05f5f
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
|
2020-05-13 10:21:49 +02:00 |
|
izac112
|
268443695b
|
Revert "Probably a revert after this"
This reverts commit 1d5ba3f493.
|
2020-05-13 09:51:27 +02:00 |
|
izac112
|
1d5ba3f493
|
Probably a revert after this
Probably getting reverted but worth a shot.
|
2020-05-13 09:43:51 +02:00 |
|
Izac Joof Forsgren
|
19175c4c72
|
Merge branch 'master' into izac-voreupdate
|
2020-05-13 09:16:09 +02:00 |
|
SplinterGP
|
75c9b2fcd2
|
Removes few extra span that shoulnd't be there
|
2020-05-13 01:47:28 -03:00 |
|
SplinterGP
|
fea63a0d83
|
Merge branch 'master' into master
|
2020-05-13 01:41:36 -03:00 |
|
SplinterGP
|
353576067a
|
Typo
|
2020-05-13 01:29:44 -03:00 |
|
SplinterGP
|
a37355b3c3
|
add comment
|
2020-05-13 00:53:44 -03:00 |
|
SplinterGP
|
e3f0f5eb3d
|
More autolathe stuff
|
2020-05-12 23:39:23 -03:00 |
|
Aronai Sieyes
|
fd817c4d16
|
Merge pull request #7814 from VOREStation/aro-hungryman
Port tg/other hunger icons, and give synths their own
|
2020-05-12 20:00:23 -04:00 |
|
Aronai Sieyes
|
3ed02c65fe
|
Merge pull request #7813 from VOREStation/aro-gurglog
Reduce admin log spam
|
2020-05-12 19:53:04 -04:00 |
|
Aronai Sieyes
|
512b9f1b21
|
Give bloodsuckers a different hunger icon
|
2020-05-12 19:15:48 -04:00 |
|
Aronai Sieyes
|
e9247c1722
|
Port tg/other hunger icons, and give synths their own
|
2020-05-12 18:43:41 -04:00 |
|
Aronai Sieyes
|
0327a2d186
|
Reduce admin log spam
|
2020-05-12 17:08:41 -04:00 |
|
Nepox
|
0ffb4c81a0
|
Fixes missing sprite from Honeybuns
It should work now.
|
2020-05-12 21:14:41 +02:00 |
|
Aronai Sieyes
|
31d69d016d
|
Fix an exploit
|
2020-05-12 14:21:10 -04:00 |
|
Aronai Sieyes
|
d93b580723
|
Merge pull request #7804 from radar651/MedHUDpatch
MedHUD Patch
|
2020-05-12 11:47:49 -04:00 |
|
Aronai Sieyes
|
3486770bc7
|
Merge pull request #7806 from VOREStation/aro-staffwhobot
Adminnery!
|
2020-05-12 11:46:44 -04:00 |
|
Aronai Sieyes
|
967c9fb9e2
|
Merge pull request #7802 from Novacat/nova-pathfinder
Fixes a typo in pathing
|
2020-05-12 11:45:32 -04:00 |
|
Aronai Sieyes
|
b5099328a5
|
Merge pull request #7800 from VOREStation/aro-moresafe
Additional safety around job hour checks
|
2020-05-12 11:36:14 -04:00 |
|
Aronai Sieyes
|
715066ba80
|
Merge pull request #7785 from Heroman3003/borg_pto
Allows Cyborgs and AI to earn PTO and departmental playtime
|
2020-05-12 11:36:01 -04:00 |
|
Aronai Sieyes
|
2b6779f4d3
|
VS: Staffwho chat command and update to status command
|
2020-05-12 11:17:45 -04:00 |
|
Aronai Sieyes
|
1cc015f9aa
|
Add a staffwho for programmatic use
|
2020-05-12 11:17:30 -04:00 |
|
Aronai Sieyes
|
d4cfdcfb3a
|
Switch to using GLOB.admins instead of admins
|
2020-05-12 11:16:54 -04:00 |
|
radar651
|
3a245943d3
|
MedHUD Patch
Medical hud patch. Arrr.
|
2020-05-12 10:29:29 -04:00 |
|
Unknown
|
08a336e582
|
Fixes a typo in pathing
|
2020-05-12 07:48:49 -04:00 |
|
Heroman
|
25a7bde56f
|
Removes redundant check for AI
|
2020-05-12 18:35:51 +10:00 |
|
Heroman3003
|
3ef2c3c145
|
Applies suggested changes
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
|
2020-05-12 18:25:38 +10:00 |
|
Arokha Sieyes
|
bf166a2d42
|
Additional safety around job hour checks
|
2020-05-12 01:01:10 -04:00 |
|
Aronai Sieyes
|
4ff57116b4
|
Merge pull request #7793 from VOREStation/upstream-merge-7125
[MIRROR] Ports Vore Telecomms Sprites
|
2020-05-11 22:39:20 -04:00 |
|
Aronai Sieyes
|
cb0d96717b
|
Merge pull request #7798 from VOREStation/aro-apclist
Put APCs and SMESes into GLOB lists to ease iteration
|
2020-05-11 22:25:17 -04:00 |
|
Aronai Sieyes
|
4f89fc535f
|
Fix cheeky icon port
|
2020-05-11 22:08:14 -04:00 |
|
Aronai Sieyes
|
96da7be01b
|
Put APCs and SMESes into GLOB lists to ease iteration
|
2020-05-11 22:05:41 -04:00 |
|
Aronai Sieyes
|
47803320f7
|
Merge pull request #7796 from VOREStation/upstream-merge-7135
[MIRROR] Port Hover Inventory and Body Indicators
|
2020-05-11 22:04:40 -04:00 |
|
Aronai Sieyes
|
f380f13c10
|
Fix whitespace merge
|
2020-05-11 21:51:21 -04:00 |
|
Novacat
|
5e5ed2eda9
|
Merge pull request #7792 from VOREStation/upstream-merge-7128
[MIRROR] [PORT] Military Jackets
|
2020-05-11 20:57:26 -04:00 |
|
Atermonera
|
b9c03fe3f1
|
Port Hover Inventory and Body Indicators
|
2020-05-11 20:05:03 -04:00 |
|
Atermonera
|
29ed593881
|
Ports Vore Telecomms Sprites
|
2020-05-11 20:02:11 -04:00 |
|
Atermonera
|
d6e369178b
|
Merge pull request #7128 from KillianKirilenko/kk-fashion2
[PORT] Military Jackets
|
2020-05-11 20:01:59 -04:00 |
|
Atermonera
|
1eeaf32a92
|
Ports Aurora record laptop sprites
|
2020-05-11 19:26:21 -04:00 |
|
Aronai Sieyes
|
324598ea29
|
Merge pull request #7735 from Rykka-Stormheart/shep-dev-reduce-max-sound-range
Reduce maximum audible range of sounds [DNM]
|
2020-05-11 18:32:57 -04:00 |
|
Aronai Sieyes
|
9e3c04b7e1
|
Fix missing dash breaking numbers in URL ends
|
2020-05-11 17:58:45 -04:00 |
|
Aronai Sieyes
|
4780cd8ee9
|
Merge pull request #7784 from VOREStation/aro-kobo
Kobold wehs
|
2020-05-11 17:56:51 -04:00 |
|
Aronai Sieyes
|
2de89b055c
|
Merge pull request #7782 from VOREStation/vplk-floor-fix
Fix floors so adding flooring updates the icon.
|
2020-05-11 17:56:32 -04:00 |
|
Aronai Sieyes
|
c672486cd6
|
Weh.ogg
|
2020-05-11 17:31:24 -04:00 |
|
Aronai Sieyes
|
23b4342629
|
Kobold wehs
|
2020-05-11 17:27:06 -04:00 |
|
Heroman
|
fb8e2680b0
|
Allows Cyborgs and AI to earn PTO and departmental playtime
|
2020-05-12 07:24:33 +10:00 |
|
Aronai Sieyes
|
0a286687a0
|
Fixes Cap and HoP playtime requirements
|
2020-05-11 17:21:39 -04:00 |
|
Leshana
|
c41ad413f3
|
Fix floors so adding flooring updates the icon.
|
2020-05-11 16:21:59 -04:00 |
|
Aronai Sieyes
|
9648659eb1
|
Merge pull request #7778 from VOREStation/aro-statuschange
Tweak bot status command
|
2020-05-11 14:36:16 -04:00 |
|