cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,115 Commits 5 Branches 0 Tags
466516b066cf9e64e90d1f4109f0f41cd4b5fe28
Commit Graph

9928 Commits

Author SHA1 Message Date
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Novacat
f1eb438b89 Merge pull request #4952 from Heroman3003/un-customizing 
Removes Height and Weight descriptors from accessible ones
 2019-04-08 00:26:31 -04:00
Heroman3003
36ce5ec2dc Removes Height and Weight descriptors from accessible ones 2019-04-08 13:02:34 +10:00
Novacat
9c4365f700 Merge pull request #4951 from Heroman3003/relanging 
Restricts monkey languages, changes keys on Sergal and Angel
 2019-04-07 22:21:42 -04:00
Novacat
40fe329d4c Merge pull request #4950 from Heroman3003/pda-is-valid-id-holder 
Fixes borg not being unlockable via PDA holding an ID
 2019-04-07 22:19:10 -04:00
Heroman3003
ea1b347a40 Restricts monkey languages, changes the keys on existing 2019-04-08 12:02:16 +10:00
Heroman3003
ec6ee7268c Fixes borg not being unlockable via PDA holding an ID 2019-04-08 11:12:33 +10:00
Novacat
7f68d6cf40 Merge pull request #4946 from Heroman3003/i-sawed-this-scalie-in-half 
Fixes broken dead lizard sprite
 2019-04-07 20:15:19 -04:00
Heroman3003
3af17f032c Fixes broken dead lizard sprite 2019-04-08 09:48:31 +10:00
Heroman3003
55ebfbb38a Fixes borgs not getting timestamps on radio messages 2019-04-08 09:32:28 +10:00
Novacat
e654ad07e3 Merge pull request #4938 from Heroman3003/berries-and-grapes-get-your-ber 
Fixes Berries and Grapes fruits for Alraune
 2019-04-07 18:39:49 -04:00
Heroman
20fc3748ed Fixes Berries and Grapes fruits for Alraune 2019-04-08 06:48:08 +10:00
Novacat
0ca3f6e216 Merge pull request #4936 from Heroman3003/walking-rewalking 
Fixes swapping/stepping mechanics ignoring the basic passability
 2019-04-07 15:50:08 -04:00
Heroman
12183c890f Fixes swapping/stepping mechanics ignoring the basic passability 2019-04-08 04:48:48 +10:00
Heroman
0c69b1b650 Fixes disconnect timer message 2019-04-08 04:13:32 +10:00
Novacat
f73a757152 Merge pull request #4924 from VOREStation/upstream-merge-6025 
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
 2019-04-06 14:56:27 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Heroman
ed81342981 Also fixes the mobs attacking non-mob stuff 2019-04-06 17:35:47 +10:00
Heroman
0d3e9383b3 Fixes some shadekin bugs 2019-04-06 16:25:56 +10:00
Unknown
34d695c301 Disables rosettes temporarily 2019-04-05 20:48:12 -04:00
Unknown
8b7ae56e83 Last Minute Fixes 
- Fixes Virgo species being able to wear hardsuits.
- Adds new rosette markings and sprites
- Adds new status display icon for code yellow
 2019-04-05 20:08:06 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Screemonster
629318de74 Refactors regeneration of ravenous races 2019-04-04 06:46:25 +01:00
Spades
3a06becdf3 Merge pull request #4879 from Novacat/nova-ert 
Adds Mlems to Default Species
 2019-04-03 20:29:22 -04:00
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
465b77bdaa Fixes an oversight 2019-03-31 13:14:24 -04:00
Unknown
692d8265ba Something reverted one of my changes 2019-03-31 12:45:36 -04:00
Unknown
c229c6b8c9 Removed Sergal lick wounds 2019-03-31 12:43:07 -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
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
Novacat
d0672ec8a1 Merge branch 'master' into nova-ert 2019-03-30 13:01:14 -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
527b7a760d Sergals and Zorren included. 2019-03-29 16:35:10 -04:00
Unknown
c2e8e52ae1 Adds Mlems to Default Species 
Tajara and Vulpkanin so far.
 2019-03-29 10:53:20 -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