Commit Graph

2443 Commits

Author SHA1 Message Date
cib
d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
2012-12-16 15:10:04 +01:00
cib
933e53aa98 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into minor_feature
Conflicts:
	code/game/gamemodes/events.dm
2012-12-16 15:02:54 +01:00
cib
679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
cib
7cf3244316 Fixes issue #2059
Mob transform into monkey no longer uses hardcoded DNA size of 14.
2012-12-16 04:57:32 +01:00
cib
cc2057240a Fixed two compile errors. 2012-12-16 04:23:57 +01:00
cib
9c4a48ffe5 Gibbing now creates actual limbs instead of decals.
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
2012-12-16 03:25:26 +01:00
Cael_Aislinn
d1cf168480 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-15 00:39:07 +10:00
cib
8b90cd6fa8 Experimental: Disable temperature exchange with space and add low
pressure damage.

This'll stop the ridiculous cold temperatures from opening an airlock
for half a second.
2012-12-11 14:57:28 +01:00
cib
f664e7c99d Fixes issue #2033 2012-12-11 12:07:11 +01:00
Cael_Aislinn
d6a1bade5b Merge branch 'features' into work_in_progress 2012-12-11 12:39:22 +10:00
Cael_Aislinn
21c9f55654 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-11 12:38:58 +10:00
Mloc
9d60a87ee4 Merge pull request #2020 from GauHelldragon/master
Service Borg Upgrade
2012-12-10 08:44:33 -08:00
Cael_Aislinn
f7d41058ed Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into features 2012-12-03 18:56:16 +10:00
Cael_Aislinn
39f07d50bf Merge https://github.com/Baystation12/Baystation12 into features 2012-12-03 18:54:21 +10:00
Cael_Aislinn
cc2771d4d5 thrown facehuggers only have a 25% chance of hitting now, and they have a chance to miss when leaping normally
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:58:58 +10:00
Cael_Aislinn
ee04fd9f1e significantly reduced alien disarm-stun time (from 10-15 seconds to 0.5-3 seconds), reduced stun chance, added a 25% chance to stun the alien, reduced alien heal rate on weeds from 5 to 1 (they still heal toxin damage at a rate of 5)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:54:29 +10:00
Cael_Aislinn
d09d7bf313 changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:50:57 +10:00
Cael_Aislinn
d55170ab97 fixed an extra line added
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 01:04:14 +10:00
Cael_Aislinn
3b6c00eae5 made space ninja a toggleable client option
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:07:18 +10:00
Cael_Aislinn
c8f603cebd WIP stuff for skin styles sprite accessory
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:07:02 +10:00
Cael_Aislinn
7e3f58cea2 CPR optimisations, made hypospray visible on the map
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:06:19 +10:00
SweeperM
b8a12b0b52 Fixes to lighting
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
2012-11-29 23:01:51 +00:00
GauHelldragon
01828f8a02 Added more comments 2012-11-29 12:21:38 -08:00
GauHelldragon
06ae2ded6f Change - Robotray only picks up food/drinks/condiments 2012-11-29 12:10:30 -08:00
GauHelldragon
17440ff756 Fixed blood regen bug
Nutriment is stored in reagents. Vessel is only for blood.
2012-11-28 12:37:27 -08:00
GauHelldragon
2c47afc22e Roboitems - Printing Pen
Allows service borg to rename paper. Click on pen to toggle between writing and renaming mode.
2012-11-28 03:03:20 -08:00
GauHelldragon
09f1d74566 Fixed typo in tray description 2012-11-27 15:24:44 -08:00
GauHelldragon
5e74a9803c Modified Service Bot's Tray to actually be useful
Service Borg's tray now can load and unload items.
2012-11-27 15:16:59 -08:00
Hawk-v3
74ed33360b Merge pull request #1975 from RavingManiac/master
Wrapping paper fixes and improvements
2012-11-23 17:52:52 -08:00
RavingManiac
f4fe11fc4c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-24 01:26:19 +08:00
cib
300219813d Fix for cryo stopping bleeding.
Forgot that internal bleeding doesn't use drip()
2012-11-23 16:04:16 +01:00
cib
d52d0c2c88 Cryo now stops bleeding temporarily.
To be exact, low body temperature in general does.
2012-11-23 15:59:43 +01:00
cib
657ede67c0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-23 15:46:03 +01:00
cib
1d7ade2e64 Fixes issue #2001
Robots with mesons or x-ray now don't see the lighting gradients anymore.
2012-11-22 22:14:30 +01:00
Mloc
33aa4f8ae4 Merge pull request #1997 from CIB/master
Go fixes
2012-11-22 12:14:25 -08:00
RavingManiac
e252c47a51 removes the floating code 2012-11-23 02:02:45 +08:00
cib
6fbff77163 Re-nerf lung capacity due to problems with internals. 2012-11-21 22:41:35 +01:00
Mloc
2f3b3f84c3 Merge pull request #1995 from CIB/master
Fixes and stuff
2012-11-21 13:30:32 -08:00
cib
966f78f1ab Fixes #1993
Bleeders now stay dead after being killed by blood loss..
2012-11-21 20:51:57 +01:00
cib
a6c1b5356c Lungs now can only be damaged when breathing from a turf. 2012-11-21 20:41:50 +01:00
cib
e6af3afd42 Fix to breathing inside objects. 2012-11-21 20:33:24 +01:00
Chinsky
c686245263 Fixes issue #1981
Only secborgs are THE LAW.
2012-11-21 20:54:50 +04:00
SkyMarshal
0644ac9af0 Merge pull request #1974 from CIB/master
Medical fixes and balancing
2012-11-19 11:19:10 -08:00
SkyMarshal
ae3cd42c76 Merge pull request #1973 from comma/master
Runtimes
2012-11-18 17:07:39 -08:00
Ispil
d6505fd064 Fix to Issue #1972. Humans now spawn with full SE length, as do monkeys. 2012-11-18 15:40:55 -07:00
cib
7b74e199c5 Fix to breath pressure tresholds.
This also increases default breathing speed a good deal.
2012-11-18 18:12:37 +01:00
Chinsky
56c20b7fb3 Fixed couple of runtimes 2012-11-18 19:32:58 +04:00
cib
8947dc7a0e Lung damage now occurs pressure-based, not oxyloss-based. 2012-11-18 15:48:38 +01:00
RavingManiac
7c76e0758d Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-18 22:04:20 +08:00
Chinsky
ffe541adec Fixes issue #1970
Did not unlock CPR in case CPR was not completed successfully.
2012-11-18 11:05:21 +04:00