cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-19 13:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,973 Commits 9 Branches 0 Tags
2a100c5cb1b69a0d956ce75bca320c42e6979ccc
Commit Graph

9897 Commits

Author SHA1 Message Date
Unknown
a475400b92 Adds Tentaclehead/mouth sprites 
...This was easy to fix? I wonder why the author never fixed it...
 2019-04-03 15:11:06 -04:00
Unknown
a45ddb17f6 Adds tie hair verb to Xenochimera 2019-04-03 15:11:06 -04:00
Heroman
9b56460487 Fixes a typo 2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9 Fixes passive and mostly passive mobs blocking the way all the time 2019-04-02 09:27:24 +10:00
Unknown
9fa575698b Conflict Resolution 2019-03-30 20:13:49 -04:00
Neerti
5967a92f02 Lynx Fixes Runtimes 2019-03-30 18:51:00 -04:00
Unknown
4297e186ca Conflict Resolution 2019-03-30 16:47:18 -04:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
63c6e7f308 Ports Stasis Cages from Baystation (#6017) 
* Ports Stasis Cages from Baystation
 2019-03-30 14:55:52 -04:00
Spades
3882cb8176 Merge pull request #4867 from Novacat/nova-survival 
Species Tweaks
 2019-03-30 09:58:29 -04:00
mistyLuminescence
8fe2ef9fde Belt-Worn RIGs (#6002) 
Belt-worn RIG framework
 2019-03-30 03:20:41 -04:00
Unknown
b602fd8c1b Cleans up code 2019-03-29 10:35:11 -04:00
Unknown
ec78c7b13b Adds Tajhair to Xenochim/Proteans 2019-03-29 09:39:30 -04:00
Unknown
21bfead698 Another Tweak 2019-03-29 09:39:30 -04:00
Unknown
2265616bc5 Species Tweaks 
- Removes Reagent tags for Akula, Neverean, and Sergals, as they were not used at all.
- Adds Reagent tag for Xenochimera.
- Xenochimera now get 25% Hunger satisfaction from Nutriment (Previously 100%)
- Fixes a Xenochimera-related runtime
- Increases the heat discomfort level of Tajarans by 6 kelvin
 2019-03-29 09:39:30 -04:00
Novacat
d3979a820f Merge pull request #4875 from Sebbe9123/Mobspeedtweak 
Tweaks pet and passive mob movement speed.
 2019-03-29 09:36:04 -04:00
Unknown
59b2681800 Fixes Character Setup 2019-03-29 08:22:10 -04:00
Sebbe
9c92d5cf2e lazy copypaste 2019-03-29 09:01:30 +01:00
Unknown
baffac60fc Lynx Fixes Runtimes 
There are still a couple of remaining runtimes...
 2019-03-28 23:50:37 -04:00
Novacat
6729bfb147 Merge pull request #4858 from Heroman3003/uncontamine 
Added ability to toggle and configure contamination and item digestion
 2019-03-28 22:12:38 -04:00
Novacat
270d22a73f Merge pull request #4857 from VOREStation/upstream-merge-5995 
[MIRROR] Tweak & Fix Promethean Stuff
 2019-03-28 22:06:32 -04:00
Novacat
2f251c3a0f Merge pull request #4874 from VOREStation/upstream-merge-6009 
[MIRROR] Makes Ambient Heartbeat sound in space controlled by Ambiance settings
 2019-03-28 22:02:48 -04:00
Novacat
e3b2a69517 Merge pull request #4852 from Haery70/master 
Fixes a Spriting Issue in Mobvore
 2019-03-28 22:01:57 -04:00
Novacat
94039e85bc Merge pull request #4850 from Heroman3003/queen-spider 
Returns giant Spider Queen mob lost in refactor
 2019-03-28 22:01:46 -04:00
Novacat
4f7280924a Update prometheans.dm 2019-03-28 21:58:15 -04:00
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
1aa2f39c0f Merge pull request #4815 from Novacat/nova-aifixes 
Fixes Newspapers
 2019-03-28 21:29:07 -04:00
Novacat
39792dd123 Merge pull request #4800 from Mewchild/MC-Mlem 
Antiseptic Mlems take 3
 2019-03-28 21:27:40 -04:00
Novacat
77bf066a98 Merge pull request #4791 from VOREStation/upstream-merge-5977 
[MIRROR] BTW I USE (FIXED) ARC
 2019-03-28 21:27:26 -04:00
Novacat
f62c6f2194 Merge pull request #4785 from VOREStation/upstream-merge-5962 
[MIRROR] Prevents people from joining with the same character
 2019-03-28 21:07:32 -04:00
Novacat
4a05c9e7e1 Merge pull request #4782 from VOREStation/upstream-merge-5966 
[MIRROR] Fixes blast door issue, and slimesky being considered unjustified.
 2019-03-28 21:07:14 -04:00
Anewbe
38c4b88ded BTW I USE (FIXED) ARC 2019-03-28 20:53:50 -04:00
Novacat
809cb419e5 Merge pull request #4766 from VOREStation/upstream-merge-5953 
[MIRROR] Fixes the 'cannot push thing being pulled' bug and other weirdness.
 2019-03-28 20:45:35 -04:00
Unknown
e0fb53e385 Conflict Resolution 2019-03-28 20:37:08 -04:00
Neerti
bf6d7bf58b Fixes blast door issue, and slimesky being considered unjustified. 2019-03-28 20:35:17 -04:00
Novacat
5ea6489cea Merge pull request #4770 from VOREStation/upstream-merge-5933 
[MIRROR] AI sprite tweaks.
 2019-03-28 20:23:14 -04:00
Novacat
8eddf7c5a8 Merge pull request #4762 from VOREStation/upstream-merge-5951 
[MIRROR] Bugspeak is whitelisted
 2019-03-28 20:22:45 -04:00
Novacat
3f659d909c Merge pull request #4758 from VOREStation/upstream-merge-5947 
[MIRROR] Rewrites Atmospherics
 2019-03-28 20:22:30 -04:00
Anewbe
e98f578ea5 Fixes the 'cannot push thing being pulled' bug and other weirdness. 2019-03-28 20:15:30 -04:00
Unknown
326a4c96fc Unwhitelists 2019-03-28 19:53:00 -04:00
Neerti
8e86e8383e Bugspeak is whitelisted 2019-03-28 19:51:07 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
Mechoid
023815e2d2 Flash rebalance. 2019-03-28 18:23:33 -04:00
Novacat
65cd059497 Merge pull request #4751 from VOREStation/upstream-merge-5869 
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
 2019-03-28 18:17:11 -04:00
Novacat
7e90225e81 Merge pull request #4736 from VOREStation/upstream-merge-5918 
[MIRROR] [READY] Fixes pixel projectiles critical bugs
 2019-03-28 17:44:22 -04:00
Unknown
ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Novacat
615f413354 Merge pull request #4727 from VOREStation/upstream-merge-5798 
[MIRROR] Adds Alien Reality pods, aka AR pods, for use in events or PoIs.
 2019-03-28 16:30:53 -04:00
Unknown
75ede8c745 Fixes Merge Conflicts 2019-03-28 16:03:52 -04:00