cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,488 Commits 8 Branches 0 Tags
005c6589c27069e7903aa911d0e44b0de00f306e
Commit Graph

8005 Commits

Author SHA1 Message Date
mwerezak
005c6589c2 Limits hearing sounds in a vacuum 2014-07-15 15:30:10 -04:00
Zuhayr
a0291b0d7a Fixes #5485 2014-07-14 12:51:30 +09:30
Zuhayr
338602ee18 Fixes #5531 2014-07-14 12:41:10 +09:30
Zuhayr
a2a5991bae Fixes #5523 2014-07-14 12:23:28 +09:30
Zuhayr
d8ff5d8ac6 Fixes #5508 2014-07-14 12:16:02 +09:30
Zuhayr
bc2f91b4e4 Fixes #5608 2014-07-14 12:02:48 +09:30
Zuhayr
2c634a8d7a Fixes #5611 2014-07-14 12:00:15 +09:30
Zuhayr
2b9b9b7a7d Fixes #5573 2014-07-14 11:50:16 +09:30
Zuhayr
8e13ce799d Bandaid fix for #5589 2014-07-14 11:42:39 +09:30
Zuhayr
b8e81f31d3 Fixes #5595 2014-07-14 10:18:37 +09:30
Zuhayr
5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
Chinsky
f84697dad0 Merge pull request #5581 from mwerezak/accessory-emp-fix 
Fixes accessories attached to a jumpsuit not being affected by EMP
 2014-07-13 08:57:08 +04:00
mwerezak
1502799afd Fixes germ levels going below zero 2014-07-12 16:18:29 -04:00
mwerezak
c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
mwerezak
835f9e52f6 Fixes webbing and holsters shielding EMP 2014-07-12 02:56:32 -04:00
Zuhayr
6981ca52f4 Trying to fix the loadout spawn issue, at least this will make it more informative. 2014-07-12 10:35:31 +09:30
DJSnapshot
0e5b7dea5b Merge pull request #5565 from Zuhayr/newgear 
Custom gear loadouts.
 2014-07-11 14:40:05 -07:00
DJSnapshot
ae45545dc8 Merge pull request #5567 from Zuhayr/robots 
Robot module changes.
 2014-07-11 14:19:36 -07:00
Walter0o
b6856eac8b can't trust players with anything 2014-07-11 09:19:23 +02:00
Ccomp5950
e44bcf81fe Merge pull request #5559 from Walter0o/deadly_fork_fix 
deadly sharp w_class 1 fix
 2014-07-10 23:40:25 -05:00
Zuhayr
d2c57115ed Added glass to the engineering module. 2014-07-11 13:55:21 +09:30
Zuhayr
0d21889bee Fixed some bugs, did some testing, moved some procs around for robot functionality. 2014-07-11 13:50:34 +09:30
Zuhayr
8f09c557f9 Added paperwork handler, clerical gripper, some other tweaks. 2014-07-11 13:12:01 +09:30
Zuhayr
70ba371658 Merge resolution. 2014-07-11 12:47:16 +09:30
Zuhayr
55d52ef1f4 Cleaned up a little oversight. 2014-07-11 12:25:08 +09:30
Zuhayr
3955edd04b Final touches for loadout system. 2014-07-11 12:16:08 +09:30
Zuhayr
903679bd79 More work on gear loadouts. 2014-07-11 11:47:53 +09:30
Ccomp5950
f66d0cf38f Merge pull request #5558 from Walter0o/apc_fix 
fixes #5449
 2014-07-10 18:48:24 -05:00
Chinsky
18e1489e29 Merge pull request #5547 from Zuhayr/mining 
Mining rework part 2, rebalance.
 2014-07-11 03:46:11 +04:00
Zuhayr
81f27320f3 Removes vox as a spawn race. 2014-07-11 08:52:09 +09:30
igalan
fc3648a523 Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not. 
This PR comments out the non-edible one and replaces any reference of it to the edible one.
 2014-07-10 22:20:13 +01:00
Walter0o
a3cc178ad6 adjusts examine for w_class 1 yankability 2014-07-10 19:58:20 +02:00
Walter0o
10ab66aa40 adjusts verb for w_class 1 yankability 2014-07-10 19:58:16 +02:00
Walter0o
9827838917 shrapnel check for human get_visible_implants() 2014-07-10 19:58:01 +02:00
Walter0o
0ff5d021de fixes #5449 
missing variable updating lead to APCs stuck in green status during powersinks.
 2014-07-10 18:21:00 +02:00
Zuhayr
85b1bbe041 Merging work into dev. 2014-07-10 20:25:07 +09:30
Zuhayr
d5784c653c Reapplied scanners to map, stopped braces working on drill turfs with no resources. 2014-07-10 20:13:59 +09:30
Zuhayr
f477d92c37 Merge with master. 2014-07-10 20:05:42 +09:30
Ccomp5950
87d907ef8d Merge pull request #5545 from Zuhayr/dev 
Added Roaper's custom item, generalized the hardsuit modification kit so...
 2014-07-10 01:04:08 -05:00
Ccomp5950
d0b5f03f71 Merge pull request #5542 from mwerezak/speech-synth 
Alternative proposal to PR #5541
 2014-07-10 01:03:58 -05:00
DJSnapshot
eacd384d39 Merge pull request #5554 from Baystation12/master 
Updating dev with master
 2014-07-09 23:00:04 -07:00
Zuhayr
f477012ab8 Merge pull request #5533 from mwerezak/wound-infections 
Fix for #5532 and the last of the infection changes, I hope
 2014-07-09 19:28:00 +09:30
Zuhayr
5ace6d3bc0 Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs. 2014-07-09 19:12:32 +09:30
Mloc
c7b2aefdc7 Merge pull request #5534 from Hubblenaut/master 
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
 2014-07-09 10:41:22 +01:00
Zuhayr
7c6bec03ae Added Roaper's custom item, generalized the hardsuit modification kit somewhat, modified Solaruin's custom item accordingly. 2014-07-09 16:58:38 +09:30
Zuhayr
326f3821e1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-09 15:52:31 +09:30
mwerezak
ffcb068b96 Fixed wrong operator 2014-07-09 00:11:20 -04:00
mwerezak
5e56d09512 Sterilizine reduces germ_level on contact 2014-07-08 18:57:07 -04:00
mwerezak
910ce676b0 Fixes advanced trauma kits claiming to disinfect but not doing so 2014-07-08 18:49:51 -04:00
unknown
dcfbeb0924 Fixes missing length check before pick() 2014-07-08 16:12:55 -04:00