cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,682 Commits 10 Branches 0 Tags
c2c01d278c709bad957fece61a31563846c213e4
Commit Graph

24929 Commits

Author SHA1 Message Date
Atermonera
c2c01d278c Merge pull request #7165 from Cyantime/patch-2 
Fixes AI Eye Examining
 2020-05-16 22:25:07 -04:00
Aronai Sieyes
1ae6911d35 Remove stray space in chat command 2020-05-16 16:33:28 -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
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
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
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
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
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
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
6873a3238d Add confused alert 2020-05-15 13:43:24 -04:00
Arokha Sieyes
90d917106a Fix bad arg 2020-05-15 12:02:12 -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
Aronai Sieyes
2798088241 Merge move 2020-05-15 10:38:27 -04:00
Aronai Sieyes
08f857e296 Merge pull request #7864 from VOREStation/aro-cats 
2 catwalk fixes, climbing and decon
 2020-05-15 10:28:07 -04:00
Aronai Sieyes
48571fa882 2 catwalk fixes, climbing and decon 2020-05-15 09:06:20 -04:00
Atermonera
fca5011fdc Refactor Move() Code 2020-05-15 01:05:43 -04:00
Aronai Sieyes
4c9bced82d DMAPI to 5.1.1 2020-05-15 00:34:42 -04:00
Aronai Sieyes
e1db9271e1 Merge pull request #7858 from VOREStation/aro-secsprite 
New HOS coat, warden jacket sprites
 2020-05-14 20:54:13 -04:00
Unknown
ff5b1fbd82 Requested Changes 2020-05-14 20:44:27 -04:00
Aronai Sieyes
9d76b140dd Fix hyphen 2020-05-14 20:17:58 -04:00
Aronai Sieyes
0101cd85ca New HOS coat, warden jacket sprites 2020-05-14 20:07:33 -04:00
Aronai Sieyes
e33c305a9e Add inventory item tooltips 2020-05-14 19:16:40 -04:00
Aronai Sieyes
41ce91e044 Merge pull request #7854 from VOREStation/aro-slemruntime 
Fix xenobio AI runtime
 2020-05-14 18:12:36 -04:00
Aronai Sieyes
819e1a863e Merge pull request #7853 from VOREStation/aro-glovetime 
Fix glove runtime
 2020-05-14 18:12:25 -04:00
Aronai Sieyes
b1f65b6d27 Fix xenobio AI runtime 2020-05-14 16:59:39 -04:00
Aronai Sieyes
157ee6773d Fix glove runtime 2020-05-14 16:58:50 -04:00
Aronai Sieyes
3992b7a50a Add observer HUD from /tg/, refactor HUDs 2020-05-14 16:29:15 -04:00
Aronai Sieyes
44b5c4411c Revive alert tweak 2020-05-14 12:36:07 -04:00