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,561 Commits 5 Branches 0 Tags
c22f9b299640ca2fdfac69bd558dc5bea27218e4
Commit Graph

13502 Commits

Author SHA1 Message Date
Hubblenaut
c22f9b2996 Merge remote-tracking branch 'upstream/master' into cash 2016-02-21 17:48:19 +01:00
Datraen
b154b2c3be Merge pull request #1000 from RusskiSam/resting-mice 
Minor - Mouse players can now "rest" properly
 2016-02-21 11:35:40 -05:00
Datraen
5cb69f01a3 Merge pull request #1029 from Kelenius/dankMemes 
Sprites for drying racks, bees for hydroponics
 2016-02-21 11:33:16 -05:00
Datraen
da3b0af760 Merge pull request #1035 from Yoshax/typofix 
Fixes #1034
 2016-02-21 11:31:45 -05:00
Hubblenaut
60f5358751 All cash now acts like bundles 2016-02-21 17:23:54 +01:00
Hubblenaut
67884b97b5 Adds cash registers and retail scanners 2016-02-21 16:46:56 +01:00
PsiOmegaDelta
afdafb3862 Makes the into-resist proc solely responsible for checking click delays. 
Because it sets the click cooldown itself downstream procs fail when they in turn check the click delay.
Fixes #11839. Fixes #12062. Fixes #12114.
 2016-02-21 12:45:01 +00:00
Kelenius
8010b014cf Merge branch 'master' into dankMemes 2016-02-21 14:20:03 +03:00
Neerti
d85b8f95f6 Merge pull request #1044 from Nalarac/master 
Adds welding goggles to autolathes.
 2016-02-21 04:57:55 -05:00
Neerti
c0ad435650 Merge pull request #1043 from Zuhayr/teshfix 
Fixes halloss and oxyloss for species with low health values.
 2016-02-21 04:57:04 -05:00
Neerti
280fad7c0f Merge pull request #1045 from Woodratt/1.4.7_bar_hotfix 
1.4.7 Bar Nerfs
 2016-02-21 04:56:41 -05:00
Neerti
93dd32f1b2 Merge pull request #1037 from Yoshax/dolladolla 
Changes predefined space cash stacks to be bundles
 2016-02-21 04:48:00 -05:00
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
woodratt
7b1b4d081b 1.4.7 Bar Nerfs 
- Fixed wrong plating around the research break area.
- Navi beacons added to the central hallway, Beepsky sold separately.
- Newer smaller bar added, second spawn for bartender added. Button to lock the doors to and from the bar added to the security checkpoint.
- Garden Camera added for seeing the center of the park.
- Mule drop off point in medical added.
- Scrubbers and vents added to the CE's Office.
- Disposals on the research outpost linked to the outlet.
- Minor layout change in the warden's office.
- 2x more sunglasses added to maintenance.
- 2x more Welding goggles added to engineering, seriously I'm not adding anymore.
- Added a extra mop and bucket to the janitor's closet.
- Space heaters now available in hard storage for engineering.
- Fixed black tiles on Tcomms.
- All existing deck of cards on the main z-level should properly be a deck of cards and not null.
 2016-02-20 21:26:37 -08:00
Zuhayr
548965dbd9 Fixes halloss and oxyloss for species with low health values. 2016-02-21 15:43:57 +10:30
Andrew
e86ed849a9 Update glasses.dm 2016-02-20 21:37:40 -06:00
Yoshax
76db1f5e6c Changes predefined space cash stacks to be bundles 
Fixes #926
 2016-02-21 02:16:14 +00:00
Yoshax
dfb8547803 Fixes #1034 2016-02-20 22:16:03 +00:00
Yoshax
d8c9114d10 Fixes #1007 and adds other missing colored jumpsuits 2016-02-20 12:52:34 +00:00
Kelenius
bcc5127a69 Sprites for drying racks, bees for hydroponics 
Adds distinct sprites for drying racks, taken from /tg/.
Remaps hydroponics a bit and adds a crate with beekeeping necessities.
Fixes a typo in the smoker.
http://imgur.com/eaDmbPE
http://imgur.com/wywJ9j3
 2016-02-20 14:34:54 +03: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
RusskiSam
bdcdc8f947 Allows mouse players to use sleeping sprite 2016-02-17 01:42:36 +03: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