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
29,527 Commits 5 Branches 0 Tags
ebd2360f43c286078c088f5afef3a9d3bd4f0463
Commit Graph

13483 Commits

Author SHA1 Message Date
Zuhayr
ebd2360f43 Merge pull request #1004 from Kelenius/master 
Monkey cubes now expand in showers
 2016-02-21 17:49:46 +10:30
Zuhayr
560e6a0ffc Merge pull request #992 from Neerti/2/14/2016_ling_nerfs_and_ear_protection_cleanup 
Ling nerfs, ear protection cleanup, and ling bugfixes.
 2016-02-21 17:48:44 +10:30
Yoshax
d8c9114d10 Fixes #1007 and adds other missing colored jumpsuits 2016-02-20 12:52:34 +00:00
Neerti
fffd4cafc3 Merge pull request #1019 from Yoshax/assemblyfix 
Fixes #891
 2016-02-20 01:57:34 -05:00
Neerti
e9c638187c Merge pull request #1022 from Yoshax/vestfix 
Fixes #889
 2016-02-20 01:57:11 -05:00
Neerti
9e1f242d6c Merge pull request #1023 from Yoshax/tajfix 
Fixes #1012
 2016-02-20 01:57:01 -05:00
Yoshax
6dff876736 Fixes #1012 2016-02-20 03:29:26 +00:00
Yoshax
2d61369837 Fixes #889 2016-02-20 03:22:44 +00:00
Matt
e05d590fdc Update living.dm 
This will need review, but may repair the succumb feature for all races, regardless of health levels.  I'm still learning this, and my syntax may be wrong.
 2016-02-19 22:17:26 -05:00
EmperorJon
daddde5962 Merge pull request #976 from Zuhayr/master 
Fixes an inverted robot check.
 2016-02-20 03:09:51 +00:00
Yoshax
d1309b7b60 Fixes #891 2016-02-20 03:07:20 +00:00
Neerti
cbac960b89 Merge pull request #1017 from Yoshax/banfix 
Fixes #987
 2016-02-19 22:00:25 -05:00
Yoshax
751647129b Fixes #894 2016-02-20 02:51:41 +00:00
Yoshax
90e2fd1b27 Fixes #987 2016-02-20 02:25:11 +00:00
EmperorJon
b282071fe6 Merge pull request #1006 from Datraen/TelecrystalVerbFix 
Adds amount of telecrystals to set verb, adds a telecrystal addition verb.
 2016-02-20 00:04:07 +00:00
Datraen
9471955904 Adds amount of telecrystals to set verb, adds a telecrystal addition verb. 2016-02-18 11:11:04 -05:00
Kelenius
a5e4aa33d5 Monkey cubes now expand in showers 
Port of https://github.com/Baystation12/Baystation12/pull/12107 and
https://github.com/Baystation12/Baystation12/pull/12183
 2016-02-18 12:24:38 +03: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
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
Neerti
b7a3a98ef0 Ling nerfs, ear protection cleanup, and ling bugfixes. 2016-02-14 19:58:57 -05: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
Zuhayr
4066326fbb Fixes an inverted robot check. 2016-02-13 17:22:55 +10:30
Zuhayr
51842ce8fa Corrects several Teshari code and icon issues. Makes Teshari suits available in the cycler. 2016-02-13 14:35:38 +10:30
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
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
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