cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,061 Commits 8 Branches 0 Tags
a2bf4c602a954c8b59a03437d53486d3e39bc20a
Commit Graph

36766 Commits

Author SHA1 Message Date
Aronai Sieyes
a2bf4c602a Remove watercooler shields until Joan does icons 2020-04-02 11:23:52 -04:00
Aronai Sieyes
1626df366c Merge pull request #7102 from VOREStation/aro-fakez 
Improves space edge-of-map behavior and add mapping tools
 2020-04-02 10:58:13 -04:00
Aronai Sieyes
e406481227 Merge pull request #7096 from VOREStation/upstream-merge-6859 
[MIRROR] Port Bay computer icons
 2020-04-02 10:58:02 -04:00
Aronai Sieyes
d16b19949d Merge pull request #7095 from VOREStation/upstream-merge-6912 
[MIRROR] [PORT] Speed up map load significantly
 2020-04-02 10:57:40 -04:00
Aronai Sieyes
ff718f4aef Merge pull request #7085 from KasparoVy/i-could-swear-kobolds-ate-rocks 
Adds Ore/Gem Eater Trait
 2020-04-02 10:55:36 -04:00
Aronai Sieyes
ef32afa133 Merge pull request #7083 from VOREStation/vplk-pointdefense 
Port Point Defense Batteries
 2020-04-02 10:53:29 -04:00
Aronai Sieyes
a7d5b37488 Merge pull request #7081 from VOREStation/aro-flip 
Improves *flip, adds Traceur trait
 2020-04-02 10:53:10 -04:00
Aronai Sieyes
bedcdd8d0c Merge pull request #7082 from Heroman3003/colorwraps 
Makes cloth footwraps colorable in loadout
 2020-04-02 10:52:58 -04:00
Aronai Sieyes
9e00215790 Merge pull request #7075 from VOREStation/aro-multiwngs 
Allow wings with a secondary color
 2020-04-02 10:52:37 -04:00
Atermonera
df77f1bcf2 Port Bay computer icons 2020-04-02 10:30:21 -04:00
Aronai Sieyes
f080a4baf3 [PORT] Speed up map load significantly 2020-04-02 10:25:03 -04:00
KasparoVy
ddb22e8e97 Merge branch 'i-could-swear-kobolds-ate-rocks' of https://github.com/KasparoVy/VOREStation into i-could-swear-kobolds-ate-rocks 2020-04-02 09:53:49 -04:00
KasparoVy
5ba1fda952 Slight Grammar Adjustment 2020-04-02 09:53:25 -04:00
Aronai Sieyes
09003a6c61 Improve space map edges 2020-04-02 01:08:07 -04:00
ArgobargSoup
5b21fa1ff5 Makes fish meat non-toxic, attempt number 2 2020-04-01 21:39:24 -07:00
KasparoVv
af2b83379a Add VS Edit 
Arokha's recommendation

Co-Authored-By: Aronai Sieyes <arokha@arokha.com>
 2020-04-02 03:31:43 +00:00
Atermonera
4f50c50452 Merge pull request #6928 from VOREStation/pol-runtimes 
Fix 2 runtimes
 2020-04-01 22:39:14 -04:00
KasparoVy
bb756cbdc9 Adds a Rocky Diet 
Taking the ore eater trait, you only gain nutrition from ore.
The amount varies, mainly based on the rarity/quality of what you're eating.

5 raw diamonds or verdantium will feed you well, while it'll take a handful of hematite or carbon to do the job. Better stick to the good stuff - it's in your best interest!
 2020-04-01 21:52:27 -04:00
Leshana
f022647037 Adds point defense batteries to defend against meteors 
- Creates a global meteors list to make it easier to find them.
- Adds point defense mainframe, batteries, projectiles, circuitboards, and R&D designs.
- Adds sound effects and icons for the new machines.
- Original code and sprites ported from Baystation.  Adtapted to our code, added icon states and QoL elements.
 2020-04-01 21:30:30 -04:00
Leshana
0377e6b4eb Only attempt to initialize a machine's circuit if its actually a type path! 2020-04-01 20:36:22 -04:00
Leshana
23482e88fa Moves topic return value defines to where they are usable everywhere. 2020-04-01 20:36:00 -04:00
Heroman
91291fb6b2 Makes cloth footwraps colorable in loadout 2020-04-02 09:34:31 +10:00
Aronai Sieyes
9b1db53bd2 Adjust traceur, taj, and teshari agility to 90 2020-04-01 15:25:17 -04:00
Aronai Sieyes
d3fae0b1d1 Improves *flip, adds Traceur trait 2020-04-01 15:09:19 -04:00
Novacat
896c2bf6b8 Merge pull request #7080 from Ketrai/wahthing 
Adds wah thing.
 2020-04-01 08:42:41 -04:00
Ketrai
51486fc10c waghh 2020-04-01 12:32:30 +02:00
Heroman
49b67392e0 Adjusts shadekin darkness hud 2020-04-01 15:27:54 +10:00
Aronai Sieyes
301b5eb467 Allow wings with a secondary color 
Adds code to support wings with extra_overlay having a secondary color, like tails do. Currently extra_overlay is just ignored on wings.
 2020-03-31 22:40:48 -04:00
Aronai Sieyes
2e5c8ff8fd Merge pull request #7072 from VOREStation/aro-airlockhelp 
Adds airlock setup helpers
 2020-03-31 22:19:44 -04:00
Aronai Sieyes
716146945c Merge pull request #7064 from VOREStation/aro-assemblies 
Update assemblies to modern coding standards
 2020-03-31 22:19:32 -04:00
Aronai Sieyes
7ccca32db0 Add a few more features to airlock helpers 2020-03-31 20:20:35 -04:00
Matica
2b9c021f08 Ports YW's ears and wings 
Port's YW's big dragon horns, as well as their wings.
 2020-03-31 20:02:42 -04:00
Aronai Sieyes
af6ebb996f Adds airlock setup helpers 2020-03-31 18:37:38 -04:00
Aronai Sieyes
91691bad85 Merge pull request #7061 from VOREStation/upstream-merge-6858 
[MIRROR] Port Bay's vendor/smartfridge sprites
 2020-03-31 17:41:13 -04:00
Aronai Sieyes
bf2b02aa34 VS: Tweak because of mining vendor sprite 2020-03-31 13:56:38 -04:00
Aronai Sieyes
9b07ee0a29 Mining equipment vendor use new vendor sprite 2020-03-31 13:56:38 -04:00
Aronai Sieyes
64b04c17af VS: Update maps for directional vendors 2020-03-31 13:56:38 -04:00
Unknown
dca2e93209 VS: Conflict Resolution + VS Changes 
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
 2020-03-31 13:56:38 -04:00
Atermonera
a23797182f Port Bay's vendor/smartfridge sprites 2020-03-31 13:56:38 -04:00
Novacat
1cdd572e6a Merge pull request #7060 from VOREStation/upstream-merge-6902 
[MIRROR] Convert alarm_manager into SSalarm subsystem.
 2020-03-31 11:45:08 -04:00
Amaya
99b50fe6ba line #70 edit 
from -> //Shifting in
	if(ability_flags & AB_PHASE_SHIFTED)
		ability_flags &= ~AB_PHASE_SHIFTED
		mouse_opacity = 2
to ->//Shifting in
	if(ability_flags & AB_PHASE_SHIFTED)
		ability_flags &= ~AB_PHASE_SHIFTED
		mouse_opacity = 1
 2020-03-31 16:30:37 +02:00
Aronai Sieyes
6d29faa770 Update space.dm 2020-03-31 01:39:26 -04:00
Aronai Sieyes
772b4dd01c Fine just cleanables 2020-03-30 22:47:35 -04:00
Aronai Sieyes
0d043fe44e Update assemblies to modern coding standards 2020-03-30 22:18:44 -04:00
Aronai Sieyes
35448c5b53 Merge pull request #7054 from VOREStation/aro-sscleanup 
Clean up some subsystem things
 2020-03-30 21:07:17 -04:00
Aronai Sieyes
271a801abe Merge pull request #7055 from VOREStation/vplk-debug-master 
Debug Master Controller
 2020-03-30 21:07:03 -04:00
Aronai Sieyes
c794498259 Merge pull request #7056 from VOREStation/aro-shield 
Add shield remote button
 2020-03-30 21:06:51 -04:00
Aronai Sieyes
9a256b407f Merge pull request #7057 from VOREStation/vplk-bughunt 
Sundry Bugfixes XI
 2020-03-30 21:06:43 -04:00
Atermonera
8986eb7720 Merge pull request #6902 from VOREStation/vplk-ssalarm 
Convert alarm_manager into SSalarm subsystem.
 2020-03-30 20:41:10 -04:00
Leshana
3e9c17c1c0 Debugging code to determine if Master failures actually happen while firing a subsystem. 2020-03-30 20:30:37 -04:00