cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-23 08:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 6 Branches 0 Tags
014729a001b51af3a665684fbe68a3c3e3489ef1
Commit Graph

16446 Commits

Author SHA1 Message Date
mwerezak
f2a74327fb R&D Server heat production and power usage 2014-07-11 15:14:54 -04:00
mwerezak
1db729e90c Makes telecoms heat production and power usage... 
...less ridiculous. Now obeys something resembling the laws of physics.
 2014-07-11 15:07:31 -04:00
mwerezak
96983fe8b8 Thermodynamics for spaceheaters 2014-07-11 14:51:57 -04:00
mwerezak
b23b4dd7ce Cleans up air alarm cooling, limits temp to TCMB 2014-07-11 14:49:23 -04:00
mwerezak
db29d172f5 Air alarm cooling now resembles thermodynamics 
Gas cooling power consumption now resembles the work required to operate
a Carnot heat pump. Cooling hot air takes less energy than cooling cold
air.
 2014-07-11 14:34:07 -04:00
mwerezak
b78c918c58 Moved h/e constant to setup.dm, included units 2014-07-11 14:29:30 -04:00
mwerezak
d1fc362032 Doors now retry if they fail to complete commands 2014-07-11 11:51:45 -04:00
mwerezak
008981c831 Moves misplaced var from airlock_control.dm 
Moved explosion_resistance from airlock_control.dm to airlock.dm proper.
 2014-07-11 10:29:52 -04:00
Mark Aherne
6c12d62285 Merge branch 'dev' of https://github.com/Faerdan/Baystation12 into dev 2014-07-11 10:53:08 +01:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
Walter0o
b6856eac8b can't trust players with anything 2014-07-11 09:19:23 +02:00
igalan
a27b2ac005 Removed commented out useless crap. 2014-07-11 05:43:59 +01: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
Ccomp5950
fdfbbc766c Merge pull request #5557 from Walter0o/laptop_fix 
fixes #5548 and #5521, missing computer3 checks
 2014-07-10 23:34:24 -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
Ccomp5950
48630cfa3e Merge pull request #5514 from JimTheCactus/master 
Patched PDA scanner to be more useful
 2014-07-10 18:48:07 -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
5289776e33 removes sharpness from forks 
too commonly available to enjoy the sharp bonus.
 2014-07-10 19:47:59 +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
Walter0o
a36d0b3ff4 part 3 of fixing #5521 2014-07-10 17:04:27 +02:00
Walter0o
6bff77c0ba part 2 of fixing #5521 2014-07-10 16:55:38 +02:00
Walter0o
323ced2803 part 1 of fixing #5521 2014-07-10 16:55:23 +02:00
Walter0o
cd0c49ab81 another laptop verb range fix 2014-07-10 16:31:29 +02:00
Walter0o
e1a8e95081 fixes rangecheck on laptop verbs 2014-07-10 16:24:38 +02:00
Zuhayr
85b1bbe041 Merging work into dev. 2014-07-10 20:25:07 +09:30
Walter0o
5b3f7b30c0 fixes #5548 
missing range check for Alt click on laptops
 2014-07-10 12:50:20 +02:00
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
b3629fed9c Merge pull request #5546 from Zuhayr/master 
Adds suit cyclers to the station map.
 2014-07-10 01:04:43 -05:00
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
Jim the Cactus
c984385adb Merge branch 'master' of https://github.com/baystation12/baystation12 2014-07-09 14:53:16 -06: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
b2033c0825 Adjusted suit cycler code, added cyclers to EVA, Engineering and Mining. 2014-07-09 17:55:25 +09:30
Zuhayr
b583754f3e Neatened a few oversights with the suit cycler up. 2014-07-09 17:05:54 +09:30