cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,604 Commits 7 Branches 0 Tags
b99e19a9782aa6e25601846c6da24f3df372489a
Commit Graph

26472 Commits

Author SHA1 Message Date
Razgriz
b99e19a978 Update gauntlets.dm 2020-05-21 03:41:03 -07:00
Razgriz
5bf0c28a38 Update arm_guards.dm 2020-05-21 03:40:34 -07:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
3cf33431f1 Merge pull request #7953 from VOREStation/Arokha/whisubtlev 
Change name of Whisubtle vis verb
 2020-05-18 15:26:45 -04:00
Aronai Sieyes
8bf7178d61 Just remove on_loc_moved entirely 2020-05-18 15:13:20 -04:00
Aronai Sieyes
ea02fe8c75 Change name of Whisubtle vis verb 2020-05-18 14:23:33 -04:00
Aronai Sieyes
ff1c571091 Merge pull request #7944 from dwinters99/emotes 
added new emotes, edited awoo
 2020-05-18 14:04:56 -04:00
Aronai Sieyes
fe9683b53b Merge pull request #7950 from VOREStation/Arokha/fixmysteryleather 
Fix mystery steel-leather
 2020-05-18 13:59:42 -04:00
Aronai Sieyes
48563200ce VS: Tweak some icon blending 2020-05-18 13:42:42 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
Aronai Sieyes
3f4fd59bd0 VS: Fix weird leather thing 2020-05-18 10:28:27 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes
7612c7a149 Merge upstream PR 2020-05-18 09:31:51 -04:00
Aronai Sieyes
6bf0112339 Port Bay's Catwalks 2020-05-17 23:57:21 -04:00
dwinters99
c987088cac Reverted *awoo to old file 
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
 2020-05-17 22:56:24 -04:00
Aronai Sieyes
4279d94382 Merge pull request #7943 from VOREStation/Arokha/botreg 
Semi-automate discord ID registration
 2020-05-17 22:40:33 -04:00
Leshana
4b29c1118e Fixed a couple issues and added columns to schema file. 2020-05-17 22:16:00 -04:00
Aronai Sieyes
e585a6dc47 Semi-automate discord ID registration 2020-05-17 21:14:18 -04:00
David Winters
d9f3ff29ae added new emotes, improved quality of awoo.ogg 2020-05-17 20:56:15 -04:00
Aronai Sieyes
df2fc68b51 Adds holoposter ads 2020-05-17 17:54:32 -04:00
Razgriz
41b6fdc00e Fix orca head 
Removed an icon pointer from orca head. Should be properly pulling from markings_ch.dmi now
 2020-05-17 14:51:38 -07:00
Aronai Sieyes
94c02f85c1 Merge pull request #7917 from VOREStation/Arokha/squeez 
Attempt some performance improvements
 2020-05-17 10:17:24 -04:00
Aronai Sieyes
71a07cf06e Make even more sure dummies don't end up processing 2020-05-17 10:07:38 -04:00
Aronai Sieyes
ebc0bf425b Nullify ai_log statements unless someone comments this out 2020-05-17 10:00:45 -04:00
Aronai Sieyes
0bad4363b8 Sleep AI processing when nobody on their Zlevel 2020-05-17 10:00:45 -04:00
Aronai Sieyes
190e8bdd5a Try to ensure some mobs don't end up processing in SSmobs 2020-05-17 09:40:39 -04:00
Arokha Sieyes
e91418fa6d Add protean shakes 2020-05-17 00:05:01 -04:00
Aronai Sieyes
b1f3a1b9cc Merge pull request #7909 from VOREStation/Arokha/extorg 
Gently refactor external_organs.dm
 2020-05-16 23:20:14 -04:00
Aronai Sieyes
4bfe8412f4 Tweak math to be faster in ext organs 2020-05-16 22:39:13 -04:00
Atermonera
c2c01d278c Merge pull request #7165 from Cyantime/patch-2 
Fixes AI Eye Examining
 2020-05-16 22:25:07 -04:00
Aronai Sieyes
c0ef0be827 VS: Tweak VS edits to external organs 
Might look like it's removing protection for people in bellies, but that code is old and is checking if they're in a mob. They aren't, they're in a belly obj, so that code hasn't been effective anyway!
 2020-05-16 18:24:54 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02: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
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
Kassc Zeravla
575ba9efb8 Demons 
*Added new demon sub types
*Added new demon sprites
*Added one new demon ability (Blood burst)
*Comment out 'demon.dm' & 'demon_subtypes.dm' as the new code for them are in 'demon_ch.dm' & 'demon_subtypes_ch.dm'
*Changed the demon stats (Extra HP, more damage, has hands, new emotes, more languages, can see in the dark and vore stats)
 2020-05-15 23:57:39 -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