cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,010 Commits 8 Branches 0 Tags
d94e1663479cc49a9e0633f8ae9462e697cf49e8
Commit Graph

22672 Commits

Author SHA1 Message Date
TheFurryFeline
d94e166347 Indigestible Collar 
Adds a new loadout item, a variation of the holo-collar with the intention of surviving digestion of its wearer. Approved, pretty much, from https://forum.vore-station.net/viewtopic.php?f=26&t=1531&sid=d3664ec3c397cebbf9a62e2e18fbb6f6
 2019-06-17 11:43:56 -04:00
Novacat
a251e5bfc8 Merge pull request #5342 from VOREStation/upstream-merge-6199 
[MIRROR] Grey scale pills and colored pillbottles
 2019-06-16 22:02:21 -04:00
Novacat
b7205d3b60 Update pill.dm 2019-06-16 21:51:52 -04:00
Novacat
ed7268b66c Merge pull request #5341 from VOREStation/upstream-merge-6216 
[MIRROR] Fixes the Chargeblade's tech cost.
 2019-06-16 21:50:54 -04:00
Novacat
4a4bc120a5 Merge pull request #5339 from VOREStation/upstream-merge-6214 
[MIRROR] Fixes ghost-edge runtime
 2019-06-16 21:50:25 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Mechoid
07cceab5bc Fixes the Chargeblade's tech cost. (#6216) 
* Fixes the Chargeblade's tech cost.

* Update illegal.dm
 2019-06-16 21:17:26 -04:00
Anewbe
d34b2784bb Merge pull request #6214 from Heroman3003/edge-time 
Fixes ghost-edge runtime
 2019-06-16 20:58:42 -04:00
Anewbe
50ff14f8f8 Merge pull request #6079 from Mechoid/AugmentPreWork 
Augment Work
 2019-06-16 20:58:32 -04:00
Verkister
ff8d89db07 Merge pull request #5325 from Verkister/ridethesausage 
Brings back oties and adds riding.
 2019-06-13 14:25:39 +03:00
Spades
fafd7675ef Merge pull request #4986 from Heroman3003/zoooooooom 
Rebalances zoom pills
 2019-06-12 17:11:48 -04:00
Neerti
21244ade2f Merge pull request #6204 from Ketrai/worms 
Adds worms
 2019-06-11 17:35:11 -04:00
Verkister
4f09f1a4cf Makes mechanical prefs show disabled OOC/LOOC 
Salt PR to rob people from their ability to conceal whether they're ignoring other players' ooc messages mechanically or out of malice and then wondering why things are going to shit and people are getting mad at them.
 2019-06-11 17:50:32 +03:00
Verkister
de0749bff3 damage nerf 2019-06-11 08:31:20 +03:00
Novacat
8680ad38c7 Merge pull request #5328 from Heroman3003/goosefix 
Fixes geese escaping the wilderness
 2019-06-10 18:53:04 -04:00
Heroman
0c1ea5c98d Replaces different AI with shutters 2019-06-11 07:11:20 +10:00
Novacat
a925985b91 Merge pull request #5322 from Heroman3003/fluffening 
Updates fluff item lists and whitelist
 2019-06-10 13:18:53 -04:00
Novacat
ea38a066fe Merge pull request #5329 from VOREStation/Verkister-patch-2 
Fixes rapala missing base_color
 2019-06-10 13:18:31 -04:00
Novacat
65f1d76130 Merge pull request #5323 from Verkister/gripthatshit 
Engie dog fixes and tweaks.
 2019-06-10 13:00:51 -04:00
Verkister
ea2c7077c7 Fixes rapala missing base_color 
-Basically fixes adminspawned rapala and the prosthetic limbs coming out blank white.
-Also snips out some irrelevant copypasta residue.
 2019-06-10 13:16:18 +03:00
Heroman
d6c295b226 Fixes geese escaping the wilderness 2019-06-10 17:32:13 +10:00
Neerti
4512cd7b18 Merge pull request #6200 from Heroman3003/xenoarch-fixes 
Fixes some xenoarch bugs
 2019-06-09 11:47:07 -04:00
Verkister
d3fad1a1e6 Brings back oties and adds riding. 
-Brings back oties. Currently adminspawn only though.
-Certain niche features still missing such as sec versions reacting to crime.
-Added red guard version.
-Tamed ones can still be befriended etc.
-Minor fixes to sprites and file naming.
-Adds riding to player controlled oties and corrupt hounds.
 2019-06-09 13:26:29 +03:00
Verkister
8d01927aa7 Engie dog fixes and tweaks. 
-Gives engie dog basic magnetic and circuit grippers.
-Fixes the decompiler halving the amount on ingested sheets.
-Doubles the nerfed matter reserve recharge rates and their starting amount.
 2019-06-09 11:54:19 +03:00
Heroman
dea577a951 Updates fluff item lists 2019-06-09 15:40:38 +10:00
Atermonera
88df3de3e6 Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy 
Infinite Frame Fixy
 2019-06-06 13:11:59 -04:00
Verkister
dea9e242fa Fixes borgs spinning on pounce 2019-06-05 18:28:44 +03:00
Novacat
78852d29eb Merge pull request #5311 from VOREStation/upstream-merge-6192 
[MIRROR] Prevents amber slime feeding from healing slimes
 2019-06-04 13:45:37 -04:00
Novacat
f86b9bd132 Merge pull request #5312 from Novacat/nova-basicfixes 
Adds missing species to Rig whitelist
 2019-06-04 13:39:20 -04:00
Novacat
3908487095 Merge pull request #5309 from VOREStation/upstream-merge-6189 
[MIRROR] Critical ManUpulator Fix
 2019-06-04 13:32:03 -04:00
Novacat
6ff16ce859 Update subtypes.dm 2019-06-04 13:30:01 -04:00
Unknown
5a367aa029 Adds missing species to Rig whitelist 
...I think I got them all this time.
 2019-06-04 13:25:06 -04:00
Atermonera
452af8a682 Prevents amber slime feeding from healing slimes 2019-06-04 13:16:27 -04:00
Atermonera
2f434b45c1 Merge pull request #6189 from mistyLuminescence/manup 
Critical ManUpulator Fix
 2019-06-04 13:13:57 -04:00
Atermonera
8be2258428 Merge pull request #6185 from chaoko99/medibots 
lowers the minimum treatment bound of medibots.
 2019-06-04 13:12:43 -04:00
Spades
1ddecf112e Merge pull request #5292 from Ketrai/fishbranch 
Adds lobsters and cuttlefish
 2019-06-03 21:06:22 -04:00
Heroman
6c65828dd6 Fixes closing laptops with no proper support 2019-06-04 08:19:11 +10:00
Novacat
db88e4ce47 Merge pull request #5297 from Heroman3003/mercrename 
Renames Syndicate Commandos to Mercenary Commandos
 2019-06-02 13:07:54 -04:00
Heroman
34115d5a48 Renames Syndicate Commandos to mercs 2019-06-02 17:49:37 +10:00
Heroman
2de30ebaf7 Removes fertilizer aspect 2019-06-02 07:09:44 +10:00
Neerti
5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights 
Fixes some Precursotech oversights.
 2019-05-31 22:18:00 -04:00
Ketrai
405bbe60c6 Fixes 2019-05-31 19:15:06 +02:00
Ketrai
6d94902ddf typos 2019-05-31 19:12:00 +02:00
Ketrai
861f3b6086 ohno 2019-05-31 18:45:51 +02:00
Ketrai
ba79dc55d1 trash items 2019-05-31 17:41:23 +02:00
Ketrai
a9e139e152 Merge remote-tracking branch 'Ketrai/fishbranch' into fishbranch 2019-05-31 17:17:59 +02:00
Ketrai
95edaac47c Adds monkfish 
ITS HOOG
 2019-05-31 17:17:29 +02:00
Ketrai
8af709f599 Update snacks_vr.dm 2019-05-30 20:35:48 +02:00
Novacat
ae20565d46 Merge pull request #5286 from VOREStation/upstream-merge-6154 
[MIRROR] Sif Trees and Icon Scaling
 2019-05-30 13:15:12 -04:00
Unknown
c7333d5a30 Conflict Resolution 2019-05-30 13:04:41 -04:00