cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 21:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,947 Commits 7 Branches 0 Tags
c1d356fe8bdc7128a0c654dbefd44e8b679837df
Commit Graph

33990 Commits

Author SHA1 Message Date
Heroman3003
c1d356fe8b Added a remains option to digesty vore 2019-04-01 12:28:02 +10:00
Novacat
82c152c1ea Merge pull request #4892 from Novacat/nova-pathfinder 
Fixes Virgo 3B Step Trigger
 2019-03-31 12:35:13 -04:00
Novacat
45f2d681c3 Merge pull request #4698 from Wickedtemp/patch-1 
Rebalances Healbelly
 2019-03-31 12:35:04 -04:00
Novacat
eee1976200 Merge pull request #4646 from Novacat/nova-heterochromia 
Reduces costs of common NIFSofts
 2019-03-31 12:34:54 -04:00
Wickedtemp
181bde4835 Nutrition at 2 
Puts nutrition at 2 with Ace's approval
 2019-03-31 10:19:03 -05:00
Unknown
9197cfeaeb New Bluespace Sprites 2019-03-31 04:35:24 -04:00
Novacat
9f1e3c4aa6 Update drinks.dm 2019-03-30 20:16:38 -04: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
Novacat
2c07c85138 Adds New Alert Levels (#6019) 
* Adds New Alert Levels
 2019-03-30 18:29:12 -04:00
Unknown
399d2c79d1 Next time, take the easy route 2019-03-30 17:33:54 -04:00
Unknown
aadf578cdb Makes this thing compile 2019-03-30 17:26:32 -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
Unknown
d24cef8c0a Hardsyncs Icons 
...It seems like the mirrorbot is not porting icon changes over properly...
 2019-03-30 15:40:06 -04:00
Novacat
63c6e7f308 Ports Stasis Cages from Baystation (#6017) 
* Ports Stasis Cages from Baystation
 2019-03-30 14:55:52 -04:00
Spades
a2ca1346c8 Merge pull request #4880 from Novacat/nova-pathfinder 
Miscellaneous Fixes.
 2019-03-30 10:06:03 -04:00
Spades
3882cb8176 Merge pull request #4867 from Novacat/nova-survival 
Species Tweaks
 2019-03-30 09:58:29 -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
Novacat
fc6f9dd0af Merge pull request #4883 from Heroman3003/clocks-have-no-buttons 
Removed clicking sound from timeclocks
 2019-03-30 04:27:32 -04:00
Novacat
8a0b50e391 Merge pull request #4882 from VOREStation/upstream-merge-6002 
[MIRROR] Belt-Worn RIGs
 2019-03-30 04:25:24 -04:00
mistyLuminescence
dd00fc35fd Winter coat suit storage expansion (#5999) 
* Winter Coat Departmental Alignment
 2019-03-30 04:24:51 -04:00
mistyLuminescence
26ead98d6f Loadout item role tweaks (#5998) 
* Loadout ItemRoles tweak
 2019-03-30 04:10:16 -04:00
Heroman
6a2155a614 Removed clicking sound from timeclocks 2019-03-30 17:36:00 +10:00
mistyLuminescence
8fe2ef9fde Belt-Worn RIGs (#6002) 
Belt-worn RIG framework
 2019-03-30 03:20:41 -04:00
Unknown
5ce5403b17 Apparently it exists and is in the wrong dmi 2019-03-30 00:52:46 -04:00
Unknown
42991bb551 Replaces clutch purse sprite 
Sprite is temporary, but makes the item usable.
 2019-03-30 00:19:09 -04:00
Unknown
f653b21d41 Removes Phase weapons from R&D 2019-03-29 23:07:50 -04:00
Unknown
7c7dc0da33 Ports Weather Improvements 2019-03-29 16:32:07 -04:00
Unknown
b602fd8c1b Cleans up code 2019-03-29 10:35:11 -04:00
Unknown
a50eb67327 Updates for newest revision 2019-03-29 10:25:11 -04:00
Novacat
cf7f1f8198 Merge branch 'master' into nova-heterochromia 2019-03-29 10:20:26 -04:00
Novacat
0d338f8c45 Merge pull request #4647 from Novacat/nova-ert 
Adds Alarm monitor NIF program
 2019-03-29 10:12:01 -04:00
Unknown
2c91a108c4 Removes Security NIF Monitor 2019-03-29 09:50:28 -04:00
Unknown
ec78c7b13b Adds Tajhair to Xenochim/Proteans 2019-03-29 09:39:30 -04:00
Unknown
c0a0bb63a6 Buffs Xenochimera Protein 
Because protein is a sub-type of nutriment, I am 99% certain that this is required to offset the nutriment debuff.
 2019-03-29 09:39:30 -04:00
Unknown
7515897713 Whitespace Reeeeee 2019-03-29 09:39:30 -04:00
Unknown
6465150c4e Fixes some serious spacebrain gas 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
Novacat
eada143541 Merge pull request #4877 from Novacat/nova-pathfinder 
Lynx Fixes Runtimes
 2019-03-29 09:02:14 -04:00
Neerti
fdeb9e3ac9 Merge pull request #6020 from Hatterhat/patch-1 
protolathes actually ACTUALLY update properly
 2019-03-29 08:43:21 -04:00
Unknown
8621295ba3 Runtimes plz 2019-03-29 08:42:06 -04:00
Unknown
d76d30c990 Fixes Potential Runtimes 2019-03-29 08:33:22 -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
d7e248a09e Might need a little help for the last two... 2019-03-29 00:12:32 -04:00
Unknown
baffac60fc Lynx Fixes Runtimes 
There are still a couple of remaining runtimes...
 2019-03-28 23:50:37 -04:00
Novacat
ca660879fd Merge pull request #4862 from Novacat/nova-pathfinder 
Ports veils from Baystation
 2019-03-28 22:12:53 -04:00