cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 7 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

2284 Commits

Author SHA1 Message Date
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
34d80b4df8 Merge pull request #4885 from VOREStation/upstream-merge-5999 
[MIRROR] Winter coat suit storage expansion
 2019-03-30 04:37:12 -04:00
mistyLuminescence
dd00fc35fd Winter coat suit storage expansion (#5999) 
* Winter Coat Departmental Alignment
 2019-03-30 04:24:51 -04:00
mistyLuminescence
8fe2ef9fde Belt-Worn RIGs (#6002) 
Belt-worn RIG framework
 2019-03-30 03:20:41 -04:00
Novacat
ca660879fd Merge pull request #4862 from Novacat/nova-pathfinder 
Ports veils from Baystation
 2019-03-28 22:12:53 -04:00
Novacat
e2afa12e38 Merge pull request #4841 from VOREStation/upstream-merge-5992 
[MIRROR] Departmental Turtlenecks
 2019-03-28 22:00:31 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
3bc9a2e903 Merge pull request #4824 from VOREStation/upstream-merge-5986 
[MIRROR] Rings no longer cover ones hands
 2019-03-28 21:29:47 -04:00
Novacat
7768216c64 Merge pull request #4801 from VOREStation/upstream-merge-5974 
[MIRROR] Fixes departmental teshari cloaks and coats
 2019-03-28 21:09:51 -04:00
Novacat
0ea5634e93 Merge pull request #4788 from VOREStation/upstream-merge-5972 
[MIRROR] fixes zaddat mask problem
 2019-03-28 21:07:40 -04:00
Novacat
e7e59730ea Merge pull request #4784 from VOREStation/upstream-merge-5956 
[MIRROR] Nock masks, cowls & robes
 2019-03-28 21:07:21 -04:00
Novacat
9079cdd276 Merge branch 'master' into upstream-merge-5972 2019-03-28 20:50:10 -04:00
Unknown
4792fc1693 Conflict Resolution 2019-03-28 20:44:59 -04:00
Neerti
15e3c04ca3 Nock masks, cowls & robes 2019-03-28 20:42:42 -04:00
Novacat
bada08276f Merge branch 'master' into upstream-merge-5959 2019-03-28 20:30:41 -04:00
Anewbe
9959a566bd Rigsuits use the correct pressure protection mechanism 2019-03-28 18:55:23 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Novacat
a4919caba2 Merge pull request #4719 from VOREStation/upstream-merge-5636 
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
 2019-03-28 14:52:51 -04:00
Novacat
3a0dbf687b Merge pull request #4720 from VOREStation/upstream-merge-5896 
[MIRROR] Changeling & Straight Jacket modifications.
 2019-03-28 14:35:51 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Atermonera
ed933cedc8 Rig helmets are now airtight when they should be, rather than when they shouldn't 2019-03-27 21:12:31 -04:00
Novacat
62820d333a Merge pull request #4690 from VOREStation/upstream-merge-5841 
[MIRROR] Voice changer tweaks and fixes
 2019-03-27 20:27:42 -04:00
Novacat
2a28a46e1a Merge pull request #4703 from VOREStation/upstream-merge-5855 
[MIRROR] Fixes Teshari hardsuits + adds sprites for most
 2019-03-27 19:26:12 -04:00
Novacat
aefedea4a3 Merge pull request #4694 from VOREStation/upstream-merge-5858 
[MIRROR] Suit coolers don't overheat in vacuum
 2019-03-27 18:58:47 -04:00
Atermonera
20604f2952 Merge pull request #5841 from Anewbe/voice_changer 
Voice changer tweaks and fixes
 2019-03-27 18:57:49 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Novacat
b717399d21 Merge pull request #4681 from VOREStation/upstream-merge-5838 
[MIRROR] Fixes a couple of tiny glasses bugs
 2019-03-27 15:51:48 -04:00
Novacat
696872690e Merge pull request #4677 from VOREStation/upstream-merge-5776 
[MIRROR] Adds pressure protection bounds to clothing.
 2019-03-27 15:18:17 -04:00
Novacat
f4aad05ea1 Merge branch 'master' into upstream-merge-5838 2019-03-27 14:26:19 -04:00
Unknown
b3ee0e766f Why is this even a conflict. 2019-03-27 14:24:57 -04:00
Novacat
823354433e Merge pull request #4659 from VOREStation/upstream-merge-5796 
[MIRROR] Adds New PoI Features + Bonus PoI
 2019-03-27 13:52:46 -04:00
Neerti
9d46150515 Adds pressure protection bounds to clothing. 2019-03-27 13:26:07 -04:00
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Novacat
70d0a30868 Merge pull request #4635 from TheFurryFeline/master 
Holocollar Addition to Autolathe. Take 3
 2019-03-27 04:46:02 -04:00
Unknown
e298f07340 Replaces schedule_callback_in 
...Tested the bell, hopefully the xenochimera revives also work
 2019-03-27 01:33:54 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Unknown
893db47d9d Adds a mining veil for Mining. 2019-03-20 18:20:45 -04:00
Unknown
944babf622 Ports veils from Baystation 
Thought about kicking this to Polaris, but, pretty sure the Taj species maintainer would not be interested in them.

Might make some additional changes later, as I saw some problems with the code while making this.
 2019-03-20 16:57:07 -04:00
Atermonera
bf7686cd02 Merge pull request #5992 from mistyLuminescence/turtlenecks 
Departmental Turtlenecks
 2019-03-08 01:45:09 -05:00
Neerti
0565cc41c1 Merge pull request #5986 from Anewbe/rings 
Rings no longer cover ones hands
 2019-03-04 08:16:27 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Heroman3003
885fe76664 Fixes departmental teshari cloaks and coats (#5974) 
* Fixes departmental teshari clothes

Some missing vars, icons, misaligned qm undercoat, forgotten edits on some icon names.

* adjusted names and descriptions of departmental teshari cloaks

* Brought loadout entries to match existing ones.

* Puts RD on command tesh stuff WL, removes leftover comment

* Fixes a one-space typo in QM tesh cloak description.
 2019-02-24 17:15:30 -05:00
Unknown
a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
Spades
14fad52791 Merge branch 'master' into upstream-merge-5744 2019-02-23 11:51:40 -05:00
Anewbe
f169a5f8bf fixes zaddat mask problem 2019-02-19 22:52:18 -05:00
Neerti
a0c757cd05 Adds a new Shroud design 2019-02-18 03:52:22 -05:00