cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 03:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,159 Commits 6 Branches 0 Tags
bd541db1fa20a006c537779e7f1ce4abf438fce7
Commit Graph

21816 Commits

Author SHA1 Message Date
Spades
00b3a05354 Merge pull request #4603 from Verkister/eww 
Adds blacklist for item ingestion (borg and trashcanfolk)
 2018-12-22 09:13:27 -05:00
Spades
770e5b088b Merge pull request #4574 from Verkister/contauring 
Some taur contrast tweaks. (And dual color alraune)
 2018-12-22 09:12:19 -05:00
Spades
73335f0037 Merge pull request #4588 from Mewchild/MC-fluff 
Updates Fluff Item
 2018-12-22 09:12:00 -05:00
Spades
31c15ac3bc Merge pull request #4495 from ArgobargSoup/ArgoCollar 
Collar tweaks
 2018-12-22 09:10:28 -05:00
Verkister
4c5cc9881a Adds blacklist for item ingestion (borg and trashcanfolk) 
-Certain items previously blacklisted for digestion can still be eaten. (pAI, posibrain, AIcard, handtele beacon)
-Implemented for borg sleepers and trash eaters to prevent ABOOSE
 2018-12-21 12:19:23 +02:00
Mewchild
7477c696dc Updates Fluff Item 2018-12-14 13:21:49 -06:00
Spades
1c92c06771 Merge pull request #4584 from Novacat/nova-heterochromia 
Replaces Ace's ammo with HP
 2018-12-14 11:29:42 -05:00
Spades
dd0a71d6b4 Merge pull request #4488 from Verkister/yeehow 
Enables riding for a bunch of animals.
 2018-12-14 11:28:32 -05:00
Verkister
4a2d895ced Code part for colorable alraune 2018-12-13 13:37:24 +02:00
Unknown
b48efb138f More merge conflict fixes 
I think I got them all.
 2018-12-13 00:33:32 -05:00
Unknown
64fd3a11a6 Replaces Ace's ammo with HP 
Since 9mm has hollow point now.
 2018-12-12 21:53:24 -05:00
Spades
8ff334d67c Merge pull request #4526 from VOREStation/upstream-merge-5736 
[MIRROR] Fixes missing hollow point ammo for 9mm
 2018-12-12 21:25:22 -05:00
Spades
670e5e3765 Merge pull request #4523 from VOREStation/upstream-merge-5718 
[MIRROR] New hair + underwear
 2018-12-12 21:24:49 -05:00
Spades
37932732ca Merge pull request #4575 from Screemonster/stopfuckingwiththepomdamnit 
makes the pompom uncontaminatable
 2018-12-12 21:24:11 -05:00
Spades
531bd6a7eb Merge pull request #4562 from Verkister/patch-27 
Disables PDA contamination.
 2018-12-12 21:22:15 -05:00
Spades
8c3c8c45c9 Merge pull request #4549 from Verkister/implantshuds 
Fixes some implant related issues.
 2018-12-12 21:19:41 -05:00
Spades
d46b03c2ca Merge pull request #4542 from Verkister/yeehowlayer 
Fixes some layering issues on taur/borg riding.
 2018-12-12 21:18:52 -05:00
Spades
1111241d7d Merge pull request #4533 from Verkister/patch-26 
Fixes digestive analyzer missing sync button
 2018-12-12 21:14:53 -05:00
Screemonster
10138a49d3 makes the pompom uncontaminatable 2018-12-10 02:49:38 +00:00
Spades
5fe51f64ad Merge pull request #4507 from Verkister/patch-25 
Fixes ingested organs giving way too much fat
 2018-12-08 21:14:38 -05:00
Spades
9b92dc1836 Merge pull request #4462 from Novacat/nova-basicfixes 
Expedition Job and Gear tweaks
 2018-12-08 09:44:15 -05:00
Spades
fe30b9a61d Merge pull request #4409 from Novacat/nova-pathfinder 
Shelter Capsule Content Tweaks
 2018-12-08 09:42:18 -05:00
Verkister
db0cfe8829 Disables PDA contamination. 
No more messaging list meta.
 2018-12-07 17:31:59 +02:00
Verkister
c1536879b2 Fixes some implant related issues. 
-Fixes reagent implants being utterly bricked.
-Fixes backup implants not showing up in AR huds.
-Both issues were caused by implants now going way deeper into the bodyparts than before.
 2018-12-05 17:47:19 +02:00
Spades
4a27ffb35a Merge pull request #4515 from pontifexminimus2/dragor-HEYLOOKTHISMORONFORGOTHOWTODOSOURCETREEIBLAMEYOUARONAIFORMAKINGMEJUMPTHROUGHTHESEHOOPS 
Renames guns with proper names for a more generic name and edits their desc.
 2018-12-04 20:22:02 -05:00
Spades
14cc6f8440 Merge pull request #4509 from lbnesquik/Kates-Weight-Fix 
Fix stuffing breaking at extreme numbers.
 2018-12-04 20:21:31 -05:00
Spades
76866c4e95 Merge pull request #4498 from Screemonster/chimchimenee 
adds umbrellas to xenoarch lockers
 2018-12-04 20:20:34 -05:00
Spades
6f8488796b Merge pull request #4544 from ArgobargSoup/ArgoLessSnippyResponse 
A less snippy automatic response for IC issues.
 2018-12-04 20:18:39 -05:00
ArgobargSoup
a7139093b3 Adds a VStation Edit. 2018-12-04 14:11:00 -08:00
ArgobargSoup
7fea35c246 Fixes a little grammar/spelling error. 2018-12-04 13:57:01 -08:00
ArgobargSoup
d68ba3ae23 Changes IC Issue response to be a bit less snippy. 2018-12-04 13:52:45 -08:00
Verkister
3840e255c6 layer fix 2018-12-04 17:18:10 +02:00
Verkister
700a62dfee Fixes some layering issues on taur/borg riding. 
-Proper layering is no longer ignored for every non-north direction.
-Also bumped borg riding offset upwards by couple pixels to better match the back height.
 2018-12-04 17:13:48 +02:00
Spades
4579aed0ed Merge pull request #4499 from VOREStation/aro-darkphoto 
Combine photosensitive trait with darksight
 2018-12-02 13:54:08 -05:00
Verkister
d90f0bbf92 Fixes digestive analyzer missing sync button 
I have no idea how that happened.
 2018-12-02 12:36:22 +02:00
Spades
822a9eff0e Merge pull request #4500 from lm40/master 
Adds Kenzie's hypospray
 2018-12-01 12:29:53 -05:00
Spades
ff0ed7d103 Merge pull request #4490 from HungryMoth/BugLanguage 
Gives Vasilissans a language finally / Bug-Speak
 2018-12-01 11:02:20 -05:00
Atermonera
67967c93af Merge pull request #5736 from SpadesNeil/pistol-ammo-fixes 
Fixes missing hollow point ammo for 9mm
 2018-12-01 00:28:04 -05:00
Atermonera
3fb5d15c43 Merge pull request #5718 from kartagrafi/hairunderwearwhatever 
New hair + underwear
 2018-12-01 00:17:11 -05:00
HungryMoth
8b56ee84a9 Removed Sol Common from Vasi's 2018-11-30 23:16:24 -05:00
HungryMoth
8c1d835b38 Gives Vasilissans the language by default 2018-11-27 13:41:44 -05:00
HungryMoth
3ce47937a4 Updated Lore for Vasilissans 2018-11-27 13:36:52 -05:00
Spades
15017e893e Merge pull request #4493 from Screemonster/gardenstorespecial 
Unwhitelists Alraune
 2018-11-26 09:08:43 -05:00
Spades
5f3485c48f Merge pull request #4492 from Verkister/yalldumphungry 
Some trash eater tweaks and additions.
 2018-11-26 09:08:00 -05:00
Spades
0468b18e7a Merge pull request #4484 from VOREStation/permits-updates 
Updates permits, adds Ace's pistol
 2018-11-26 09:03:38 -05:00
Spades
c8b50f7a67 Merge pull request #4475 from Novacat/nova-weapons 
Weapons Tweaks and Sprites
 2018-11-26 09:02:55 -05:00
Spades
cca310a2d6 Merge pull request #4351 from Screemonster/nogurgletheblurble 
Makes promethean cores indigestible
 2018-11-26 08:59:28 -05:00
Spades
a542e23e4e dragor no 2018-11-25 20:32:40 -05:00
Unknown
19efdc84dc Improved Holdout Description 2018-11-25 17:33:04 -05:00
pontifexminimus2
5913203c0f Due to request of Ace. 2018-11-25 17:22:35 +01:00