cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,491 Commits 9 Branches 0 Tags
c782297caeb8b33a9dbdbbbea0851e25504af70b
Commit Graph

22018 Commits

Author SHA1 Message Date
Yoshax
c782297cae Adds 3 new types of underwear 2016-02-18 23:35:32 +00:00
EmperorJon
25fa943c88 Merge pull request #1001 from Datraen/CheckAntagonistUpgrade 
Adds player panel, ckey info to Check Antagonists panel.
 2016-02-17 03:31:43 +00:00
Datraen
52714013a9 Merge pull request #983 from Ithalan/master 
Fixes plant analyzer and hydroponics tray information
 2016-02-16 20:25:07 -05:00
Datraen
34721f6a80 Merge pull request #997 from MagmaRam/lingfix 
Fixes #984
 2016-02-16 20:13:15 -05:00
Datraen
59e66c3b54 Adds player panel, ckey info to Check Antagonists panel. 2016-02-16 20:05:19 -05:00
EmperorJon
041f1da5f7 Merge pull request #999 from Datraen/Sleeves_Eyepatch 
Corrects the name of a suit in the icons and a suit's roll-ability
 2016-02-16 20:05:15 +00:00
Datraen
f979e86ec0 Corrects the name of a suit in the icons and a suit's roll-ability 2016-02-16 13:07:09 -05:00
Datraen
129965b1c4 Adds a variable to check for grenade loading, makes frags unloadable. 2016-02-16 12:58:17 -05:00
MagmaRam
5d50921d08 Fixes #984 2016-02-15 15:45:17 -06:00
Mark9013100
13149b6fe0 Gives the UV light a toggle button. 2016-02-14 04:36:07 -05:00
Ithalan
9db3c3e268 Fixes plant analyzer not showing information about gasses consumed or released 
Fixes hydroponics trays not showing sensor information when empty
 2016-02-13 22:05:18 +01:00
Mark9013100
15bbe47b79 Removes ACMEco cigarettes. 2016-02-13 15:11:31 -05:00
Neerti
8ccfcc87ca Merge pull request #974 from Zuhayr/master 
Corrects several Teshari code and icon issues.
 2016-02-13 00:39:50 -05:00
Zuhayr
51842ce8fa Corrects several Teshari code and icon issues. Makes Teshari suits available in the cycler. 2016-02-13 14:35:38 +10:30
Mark9013100
cab884b5dc Implements sprites for shotgun shell boxes. 2016-02-12 20:30:43 -05:00
Zuhayr
9c30bd6c0c I'm an idiot. Fixes starving Teshari. 2016-02-12 11:01:29 +10:30
Zuhayr
82faa30992 Merge pull request #961 from Mark9013100/2/10/2016jackets 
Adds the IA jacket/fake sunglasses to custom loadout
 2016-02-12 10:06:21 +10:30
Neerti
9493290997 Merge pull request #933 from Zuhayr/tesharifixes 
Small mob reagent changes.
 2016-02-11 17:18:07 -05:00
Mark9013100
7d3b5a09b7 Adds the IA jacket/fake sunglasses to custom loadout 2016-02-10 14:16:50 -05:00
Mark9013100
63db2c8f0b Portable Freezers can no longer be folded 2016-02-10 05:43:09 -05:00
Zuhayr
517bf27034 Fixes a char setup runtime. 2016-02-10 15:15:23 +10:30
Zuhayr
9205a938eb Fixes Teshari slowdown being applied due to health values. 2016-02-10 11:47:20 +10:30
Zuhayr
1130421932 Reduces minimum age for jobs so Teshari and dionaea can actually join. 2016-02-10 11:29:47 +10:30
Neerti
ac3dde64b9 Merge pull request #942 from Zuhayr/teshari 
Age is now species-based, added hairstyles for Teshari.
 2016-02-09 18:56:56 -05:00
Zuhayr
c016cc6beb Merge pull request #898 from Neerti/2/4/2016_emp_tweaks 
EMP tweaks/fixes
 2016-02-10 10:03:06 +10:30
EmperorJon
c430f065b4 Merge pull request #938 from Neerti/2/8/2016_stasis_bag_cleanup_and_buffs 
Makes stasis bags better
 2016-02-09 16:05:08 +00:00
EmperorJon
99353659c6 Merge pull request #935 from Neerti/2/8/2016_examine_tab_armor_updates 
Examine tab expansion for armor/clothes
 2016-02-09 16:04:29 +00:00
Neerti
2c9a404143 Replaces ugly way of checking for coverage/slots with GinjaNinja32's way. 2016-02-09 10:10:13 -05:00
Zuhayr
ae802509bc Added several new hair and face icons for Teshari, modified old icons. 2016-02-09 20:41:15 +10:30
Zuhayr
84a045ffe5 Moved age min and max to the species datum. 2016-02-09 18:20:23 +10:30
Neerti
5058298033 Merge pull request #937 from Zuhayr/loadout 
Added new panel for loadout.
 2016-02-08 17:33:45 -05:00
Neerti
ecebb49ad1 Makes stasis bags better. 2016-02-08 17:19:38 -05:00
EmperorJon
f266632018 Merge pull request #936 from Neerti/2/8/2016_vest_oversight_fix 
Fixes oversight with sec vests.
 2016-02-08 19:12:10 +00:00
EmperorJon
033e440dab Merge pull request #931 from Neerti/2/7/2016_fix_rubbers 
Rubbers and beanbag rounds will now respect armor
 2016-02-08 19:11:54 +00:00
Neerti
bc283a4293 Merge pull request #934 from Kelenius/cloakPlzGo 
Removes cloaking device
 2016-02-08 09:55:46 -05:00
Zuhayr
7453414faa Added new panel for loadout. 2016-02-09 00:09:39 +10:30
Neerti
0c61b0e196 Fixes oversight with sec vests. 
This is to remain consistent with bulletproof/ablative/other vests.  Previously, the vest covered the arms and legs as well, due to inheritance.
 2016-02-08 06:42:56 -05:00
Neerti
fb62942d3e Examine tab will now tell you which slots a piece of clothing can occupy, which bodyparts it covers, and if it has THICKMATERIAL or not. 2016-02-08 06:32:04 -05:00
Kelenius
f106b3f26b Removes cloaking device 
Adminspawn-only device that is never used, but every time a human
updates icons, they check if they have one. Neat!
 2016-02-08 14:28:54 +03:00
Zuhayr
4820420182 Added several mobsize and Teshari checks to reagent processing. 2016-02-08 20:21:04 +10:30
Zuhayr
86fdd0c86b Fixes for previous. 2016-02-08 19:57:15 +10:30
Kelenius
e017b3f4ba Fixes trays not processing reagents 
#921
 2016-02-08 12:00:49 +03:00
Neerti
5a48bbc7c7 Merge pull request #924 from Zuhayr/master 
Allowed pouring reagent containers down the sink.
 2016-02-08 02:35:38 -05:00
Neerti
6b4896f886 Rubbers and beanbag rounds will now respect armor, melee armor specifcally. 
Rubber round damage halved.
 2016-02-08 01:19:17 -05:00
Zuhayr
2e83dfba51 Added blood volume and hunger variables for species. 2016-02-08 13:13:35 +10:30
Zuhayr
2fc81a3d4d Added an economic modifier for Teshari. 2016-02-08 12:00:26 +10:30
Zuhayr
8c1b7c06ad Made Teshari clothing not have any coverage. 2016-02-08 10:30:02 +10:30
Zuhayr
8c7faee03a Made Teshari suits available to emag/merc cycler. 2016-02-08 10:29:52 +10:30
Zuhayr
81a6d9ddbf Should fix Teshari stripping intent bugs. 2016-02-08 10:29:32 +10:30
Zuhayr
dad8d16136 Allowed pouring reagent containers down the sink. 2016-02-07 21:49:23 +10:30