cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,485 Commits 6 Branches 0 Tags
d2fb9a769168e91530e8a1da74a47b396be0b52d
Commit Graph

54485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Novacat
61f7ef53c2 Merge pull request #8851 from Rykka-Stormheart/shep-dev-ambience_chance_pref_fix 
Hotfix for Ambience Freq Overwriting Ambience Chance on Save
 2020-08-27 18:36:56 -04:00
Rykka
82a8a9487b Hotfix for Ambience Freq Overwriting Ambience Chance on Save 
I accidentally had ambience_freq being written to ambience_chance, oops.
 2020-08-27 18:16:57 -04:00
Novacat
335737e27e Merge pull request #8850 from ShadowLarkens/shadow_mew 
Declare myself goddess of TGUI
 2020-08-27 17:04:17 -04:00
Novacat
5e22f379db Merge pull request #8845 from Heroman3003/nanofix 
Makes Liquid Protean and Repair Nanites affect synths
 2020-08-27 15:55:29 -04:00
Novacat
66c867d5db Merge pull request #8849 from Natje0/shutlee 
A couple Curashuttle fixes and changes
 2020-08-27 15:55:01 -04:00
Novacat
43360b19ce Merge pull request #8844 from Rykka-Stormheart/shep-dev-scree-rabbits 
Adds Knights of the Round Table, Rabbits, Killer Rabbits
 2020-08-27 15:52:54 -04:00
Novacat
fe8b90b3ee Merge pull request #8835 from ShadowLarkens/tgui_inventory 
TGUI Drag Inventory
 2020-08-27 15:52:07 -04:00
ShadowLarkens
23883f93c3 Declare myself goddess of TGUI 2020-08-27 07:32:02 -07:00
Natje0
44978877b3 Hnngh. Soup. 
Curabitur stuff
 2020-08-27 15:44:34 +02:00
Heroman3003
dbf373c6a7 Makes Liquid Protean and Repair Nanites affect synths 2020-08-27 14:46:18 +10:00
Rykka
48118b3eca Changes desc to . and changes grumpiness to 0 2020-08-26 23:42:01 -04:00
Rykka
3b713c678d Gives Killer Rabbit 2000 Health 2020-08-26 22:32:45 -04:00
Rykka
cf2a964018 Adds Rabbit to Predcrate, someone else can make a smaller crate 
Also fixes rabbit body colors
 2020-08-26 22:23:45 -04:00
Rykka
56d7235525 Adds Knight Boots to vendor/crate/POI, adds Lennie/George to Tether 2020-08-26 22:19:19 -04:00
Rykka
6ef52be981 Adds Knights of the Round Table, Rabbits, Killer Rabbits 
Scree's Request!

This adds the Knights of the Pizza Table (Monty Python's Knights) armor and costumes. Costumes are orderable via Cargo OR Vendors.

This adds passive Rabbit voremobs, and a killer rabbit. If you pet the rabbit too much, you'll make it grumpy, and it will do a nomf. You can see their grumpiness level in their description/examine.

Knight's Armor has good melee and bullet protection, and little else.
 2020-08-26 21:58:30 -04:00
Novacat
2f343f778c Merge pull request #8842 from Rykka-Stormheart/shep-dev-engine-modularization 
Modularizes Engine Submap Loading so it can be selected per-map!
 2020-08-26 13:32:16 -04:00
Meghan-Rossi
8127675389 Add tesla to map test (#355) 2020-08-26 11:10:14 -04:00
Novacat
85c425a2eb Merge pull request #8841 from VOREStation/upstream-merge-7545 
[MIRROR] Enables passtable for cleanbots
 2020-08-26 09:44:51 -04:00
Rykka
aeb3a10235 Modularizes Engine Submap Loading so it can be selected per-map! 
Self-Explanatory - just go to engine_submaps_vr/mapname and check the _engine_submaps.dm to choose the engine presets you want to load.

Figured we might as well modularize this as it'll help with upcoming/new map projects in the future. :blep:

@novacat pls speedmerge thx
 2020-08-26 09:32:12 -04:00
Novacat
29b1890de5 Merge pull request #8840 from VOREStation/upstream-merge-7541 
[MIRROR] Prevent acid glands from melting non-simulated turfs
 2020-08-26 09:06:55 -04:00
Novacat
e26273d905 Merge pull request #8839 from VOREStation/upstream-merge-7544 
[MIRROR] Fixes eye glow appearance flags
 2020-08-26 09:06:28 -04:00
Novacat
928c420444 Merge pull request #8838 from VOREStation/upstream-merge-7538 
[MIRROR] Adds attacklogs for aggressive grabbing
 2020-08-26 09:06:12 -04:00
Novacat
213b16a5c9 Merge pull request #8837 from VOREStation/upstream-merge-7540 
[MIRROR] ChewMAX Bar Fix
 2020-08-26 09:05:56 -04:00
VirgoBot
6cb7001771 Enables passtable for cleanbots 2020-08-26 03:52:25 -04:00
Verkister
d9dbb7d1d7 Enables passtable for cleanbots (#7545) 
One of the most common reasons behind cleanbots getting stuck in stupid places is because they went after some mess underneath table/rack/railing/whatever without ever getting to reach it.
 2020-08-26 03:52:25 -04:00
VirgoBot
f6623fd8e4 Prevent acid glands from melting non-simulated turfs 2020-08-26 03:51:09 -04:00
Cyantime
27913e5045 Prevent acid glands from melting non-simulated turfs (#7541) 2020-08-26 03:51:09 -04:00
VirgoBot
424e182f6c Fixes eye glow appearance flags 2020-08-26 03:50:58 -04:00
Verkister
b65b82345b Fixes eye glow appearance flags (#7544) 
Fixes eye glow layer not inheriting mob appearance flags.
 2020-08-26 03:50:58 -04:00
VirgoBot
2f4cd7666a Adds attacklogs for aggressive grabbing 2020-08-26 03:49:42 -04:00
Shadow-Quill
da96910c5c Attack! (#7538) 2020-08-26 03:49:42 -04:00
VirgoBot
0804034275 ChewMAX Bar Fix 2020-08-26 03:49:29 -04:00
Killian
afaa0e650c ChewMAX Bar Fix (#7540) 
* Update robotics.dm

* Update scanner.dm

* Update snacks.dm
 2020-08-26 03:49:29 -04:00
ShadowLarkens
0c2c82fe5f TGUI Drag Inventory 2020-08-25 21:56:51 -07:00
Novacat
444677252c Merge pull request #8832 from VOREStation/upstream-merge-7474 
[MIRROR] Improvements to mech missiles.
 2020-08-25 21:05:36 -04:00
Novacat
15c28291ac Merge pull request #8834 from ShadowLarkens/fading_titlescreen 
Fading titlescreen from /tg/
 2020-08-25 20:42:51 -04:00
Novacat
d9f2e5dd07 Update vorestation.dme 2020-08-25 20:37:53 -04:00
ShadowLarkens
264793b36a Fading titlescreen from /tg/ 2020-08-25 16:50:23 -07:00
Atermonera
b2250d9b47 Improvements to mech missiles. 2020-08-25 19:16:57 -04:00
Novacat
a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2 
Explorer/Pathfinder Belts
 2020-08-25 17:15:14 -04:00
Novacat
b5c884eb03 Merge pull request #8825 from ShadowLarkens/tgui_research_rebased 
TGUI Research
 2020-08-25 17:12:24 -04:00
Novacat
7ae5bf301b Merge pull request #8819 from dwinters99/gutterband 
Changes Gutter to Gutterband, removes whitelist.
 2020-08-25 16:38:06 -04:00
Novacat
0ef6772c9b Merge pull request #8823 from cadyn/cadyn-bugfixes 
Couple bugfixes
 2020-08-25 16:37:30 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Novacat
3de27a9e8f Merge pull request #8831 from Rykka-Stormheart/shep-dev-map-folder-refactor 
Refactor /maps/ folder, this may break Travis
 2020-08-25 15:56:51 -04:00
Rykka
14b13e9299 Refactor /maps/ folder, this may break Travis 
Tested and confirmed working, all expedition areas and POIs spawned correctly and as expected.

Added a new guide to help new contributors walk through adding new POIs or expedition areas, or gateway maps, in case the new system is confusing at all.

This will probably also break the following PR's:
https://github.com/VOREStation/VOREStation/pull/8807
https://github.com/VOREStation/VOREStation/pull/8558
https://github.com/VOREStation/VOREStation/pull/8820
 2020-08-25 15:22:47 -04:00
Novacat
1d00e1a695 Merge pull request #8827 from VOREStation/upstream-merge-7557 
[MIRROR] Fixes Runtime in vchat_client.dm,85: Cannot execute null.is preference enabled
 2020-08-25 13:18:48 -04:00
VirgoBot
c9bc323266 Fixes Runtime in vchat_client.dm,85: Cannot execute null.is preference enabled 2020-08-25 00:32:25 -04:00
Atermonera
3669657656 Fixes Runtime in vchat_client.dm,85: Cannot execute null.is preference enabled (#7557) 2020-08-25 00:32:25 -04:00