cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 04:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,582 Commits 8 Branches 0 Tags
a964a3a1bcf95cc5fed958dd28a54ff2e6ac1c34
Commit Graph

39258 Commits

Author SHA1 Message Date
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Aronai Sieyes
0775d9e19c Merge pull request #7901 from VOREStation/Arokha/issue7877 
Fixes mousedrop shenanigans
 2020-05-16 12:46:42 -04:00
Aronai Sieyes
2b96e0bfae Fixes mousedrop shenanigans 2020-05-16 12:13:24 -04:00
Aronai Sieyes
b8eed3cd6d Merge pull request #7897 from Rykka-Stormheart/shep-dev-ai-open-this-door 
Port over AI Opening Doors from Paradise
 2020-05-16 11:45:15 -04:00
Aronai Sieyes
96ab9f0bb8 Merge pull request #7899 from KasparoVy/avast-a-wild-ass 
Adds Equine Facial Markings & Ears
 2020-05-16 11:38:41 -04:00
Novacat
924fcc8ed2 Merge pull request #7890 from VOREStation/upstream-merge-7144 
[MIRROR] Allows fax machine toner replacement
 2020-05-16 07:05:53 -04:00
izac112
3185c4145b Merge branch 'izac-voreupdate' of https://github.com/Yawn-Wider/YWPolarisVore into izac-voreupdate 2020-05-16 09:06:36 +02:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Izac Joof Forsgren
ec13c2c57d Merge branch 'master' into izac-voreupdate 2020-05-16 09:02:59 +02:00
Izac Joof Forsgren
1e34b1f471 Merge branch 'master' into patch-2 2020-05-16 08:51:08 +02:00
Izac Joof Forsgren
147d58e8fa Merge branch 'master' into izac-voreupdate 2020-05-16 08:49:58 +02:00
KasparoVy
67ce8f383c Adds Equine Facial Markings & Ears 
I was poring over the markings list as usual, inspired this time to draft a donkey but was woefully struck by a lack of equine markings. Neigh, this cannot be! So I took to resolving the issue post-haste.

The muzzle is flexible goes quite well with draconic designs too. Recommended to use with the Sergal bodytype for best results.
 2020-05-16 02:35:06 -04:00
Rykka
3c1c5ab3e4 Port over AI Opening Doors from Paradise 
This makes an [OPEN] link appear on all radio messages the AI hears (to the right of the follow link). When clicked, it allows the AI to open
the door nearest to the speaker (or, if it is a voice changer, the door
nearest to the poor sap who had his voice stolen).

AI, Open This Door!
 2020-05-16 01:56:24 -04:00
Aronai Sieyes
40b8b52826 Merge pull request #7894 from VOREStation/upstream-merge-7147 
[MIRROR] Give Mining Drones a proper fire delay.
 2020-05-15 22:48:25 -04:00
Aronai Sieyes
44d490ab07 Merge pull request #7891 from VOREStation/upstream-merge-7139 
[MIRROR] Even More GPS Variety
 2020-05-15 22:46:26 -04:00
Aronai Sieyes
395034ceb9 Merge pull request #7889 from VOREStation/upstream-merge-7115 
[MIRROR] Add some ctrl/alt vehicle helper clicks
 2020-05-15 22:44:38 -04:00
Leshana
6b341b5013 Merge pull request #7885 from VOREStation/upstream-merge-7090 
[MIRROR] Don't give POI SMES more charge than possible
 2020-05-15 22:35:52 -04:00
Atermonera
c4e6baba6d Merge pull request #7147 from Mechoid/MiningDroneFix 
Give Mining Drones a proper fire delay.
 2020-05-15 21:13:39 -04:00
Atermonera
8b0a581e5d Merge pull request #7139 from KillianKirilenko/kk-gps 
Even More GPS Variety
 2020-05-15 21:07:00 -04:00
Atermonera
d14a15ec6f Merge pull request #7144 from Cyantime/patch-1 
Allows fax machine toner replacement
 2020-05-15 21:06:50 -04:00
Aronai Sieyes
23d9c7cbdc Update cargo_train.dm 2020-05-15 20:59:21 -04:00
Atermonera
88b1ef4fc6 Add some ctrl/alt vehicle helper clicks 2020-05-15 20:58:18 -04:00
Aronai Sieyes
7757e4e7dd Merge pull request #7875 from VOREStation/upstream-merge-7082 
[MIRROR] Refactor move/click code and cooldowns
 2020-05-15 20:57:31 -04:00
Atermonera
8cdc792920 Merge pull request #7090 from VOREStation/aro-poismes 
Don't give POI SMES more charge than possible
 2020-05-15 20:56:27 -04:00
Aronai Sieyes
32ae9bcd6b Merge pull request #7883 from VOREStation/aro-erishud 
Add mini HUDs to mechs, rigs
 2020-05-15 20:54:58 -04:00
Aronai Sieyes
36aa031b1e Merge pull request #7882 from VOREStation/upstream-merge-7162 
[MIRROR] Fixes Runtime in ,: bad arg name 'disable_warning'
 2020-05-15 20:54:46 -04:00
Aronai Sieyes
71271c0274 Merge pull request #7881 from VOREStation/upstream-merge-7148 
[MIRROR] cleans up advanced_who output
 2020-05-15 20:54:31 -04:00
Aronai Sieyes
ff4ded2781 Merge pull request #7879 from VOREStation/upstream-merge-7134 
[MIRROR] Random item spawners qdel properly on init without using sleep
 2020-05-15 20:53:36 -04:00
Aronai Sieyes
63cf68c2f0 Merge pull request #7878 from VOREStation/upstream-merge-7114 
[MIRROR] Fixes #649
 2020-05-15 20:53:16 -04:00
Aronai Sieyes
9748b077ef Merge pull request #7876 from VOREStation/aro-detsuit 
Move cyberpunk detective gear to be suits, add long version
 2020-05-15 20:52:43 -04:00
Aronai Sieyes
b419e79166 Merge pull request #7873 from VOREStation/aro-conf 
Fix item-based alerts, and add a confused alert
 2020-05-15 20:52:14 -04:00
Aronai Sieyes
f0930ca045 Merge pull request #7874 from VOREStation/aro-ocuround 
Round hours shown on occupations page
 2020-05-15 20:52:01 -04:00
Aronai Sieyes
6802b233c6 Merge pull request #7872 from VOREStation/aro-badarg 
Fix bad arg
 2020-05-15 20:51:48 -04:00
Aronai Sieyes
0f0400cfc3 Merge pull request #7871 from VOREStation/aro-hudhiding 
Allow hiding other huds like ghost huds with F12
 2020-05-15 20:48:45 -04:00
Aronai Sieyes
b3b22daa1d Merge upstream PR 2020-05-15 20:46:03 -04:00
Aronai Sieyes
259e33da5d Merge conflict fix for 7162 2020-05-15 20:23:49 -04:00
Aronai Sieyes
cb36e93a30 Add mini HUDs to mechs, rigs 2020-05-15 17:14:29 -04:00
Atermonera
5e6cbc0315 Fixes Runtime in ,: bad arg name 'disable_warning' 2020-05-15 16:39:04 -04:00
Atermonera
b6c8d31829 cleans up advanced_who output (#7148) 
* cleans up advanced_who output

* Missing tag
 2020-05-15 16:37:35 -04:00
Atermonera
c8e5abc937 Random item spawners qdel properly on init without using sleep (#7134) 2020-05-15 16:36:09 -04:00
Atermonera
3057230bb2 Fixes #649 (#7114) 2020-05-15 16:33:17 -04:00
Aronai Sieyes
a23605c9fd Move cyberpunk detective gear to be suits, add long version 2020-05-15 14:17:34 -04:00
Atermonera
02f82fc1f0 Refactor move/click code and cooldowns 2020-05-15 14:03:15 -04:00
Aronai Sieyes
2d590505c1 Fix buckled/item based alerts 2020-05-15 13:43:35 -04:00
Aronai Sieyes
6873a3238d Add confused alert 2020-05-15 13:43:24 -04:00
Arokha Sieyes
74aaebeacd Add tooltips to ghost HUD buttons 2020-05-15 12:05:34 -04:00
Arokha Sieyes
90d917106a Fix bad arg 2020-05-15 12:02:12 -04:00
Arokha Sieyes
9ec585ec68 Allow hiding other huds like ghost huds with F12 2020-05-15 11:57:44 -04:00
Aronai Sieyes
cc6592e35c Update revinfo proc 2020-05-15 11:21:30 -04:00
Aronai Sieyes
c01752681f Merge pull request #7862 from VOREStation/upstream-merge-7052 
[MIRROR] Refactor Move() Code
 2020-05-15 10:50:21 -04:00