8c7592fa00
Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages.
2012-07-31 01:14:14 -04:00
35eb1a52c6
Merge pull request #1546 from Mloc/dev
...
Null checks, fixed cael's derp.
2012-07-29 13:18:43 -07:00
79d4c39754
Fixed cryo pressure damage
2012-07-29 23:15:42 +03:00
ba370735ff
NULL checks.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2012-07-29 18:34:12 +01:00
333f0903e8
Merge pull request #1534 from caelaislinn/master
...
blast doors, lockdown comp, pets
2012-07-29 08:46:18 -07:00
af8324ec7d
Merge pull request #1543 from Mloc/dev
...
Custom items + New cow sprite.
2012-07-29 08:37:33 -07:00
4d240daa7e
Custom items + New cow sprite.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2012-07-29 16:32:52 +01:00
b34aae0c05
Merge pull request #1542 from comma/master
...
Fix for admin rejuv
2012-07-29 08:32:05 -07:00
60f87cf538
Fix for admin rejuv breaking examine
2012-07-29 19:30:07 +04:00
2909b86195
this time, with the actual file
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-30 01:27:53 +10:00
c913f81517
played around with pets. hid a special one in the mining base
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-30 01:25:06 +10:00
1ecbc5c950
modified lockdown computer and blast doors / shutters on antiqua and exodus, now has increased usability etc.
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-29 03:28:50 +10:00
cae467ce39
Merge pull request #1531 from headswe/master
...
Fixes a few runtime errors
2012-07-28 08:55:22 -07:00
3a1f30ece4
A few fixes.
2012-07-28 17:16:22 +02:00
63e826d119
Derp, edited the wrong variable
2012-07-28 17:01:20 +03:00
c1ec998c1f
Fix power outage problems, take 2
2012-07-28 16:59:59 +03:00
c4b21c61f7
Quickfix for station losing power in less than 10 minutes
2012-07-28 16:50:10 +03:00
1952a6fc3a
Lighting now turns off before equipment
2012-07-28 16:46:54 +03:00
2569bb1d83
Merge pull request #1530 from caelaislinn/master
...
tgstation.dmm mapfixes, antiqua.dmm engine updates, R-UST updates
2012-07-28 04:42:03 -07:00
09687957d9
particles should actually dmg properly, instead of error. cant believe this didnt come up earlier
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-28 21:40:07 +10:00
3cf5cb0d3d
Merge pull request #1522 from caelaislinn/powerchanges
...
powerchanges
2012-07-28 00:23:27 -07:00
760e86c4b0
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-07-28 17:19:35 +10:00
6a713bc18b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-07-27 21:42:03 +10:00
62dcb7be1b
Adds caching to dummy objects, seems to work great.
2012-07-26 17:14:31 -07:00
af2af9d6b2
Attempted fix for ZAS possibly crashing BYOND, removed special case for Cryo from human life as it is already handled by cryo's return_air() proc, made breathing in superheated gas burn you a wee bit.
2012-07-26 12:10:16 -07:00
23e263e851
This hopefully fixes death-cryo
2012-07-26 20:22:54 +03:00
be5820dd51
revert power changes, moved them to a separate branch
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-27 02:22:03 +10:00
ca4979313a
Merge branch 'master' of github.com:caelaislinn/Baystation12
2012-07-27 02:06:33 +10:00
0e6939de85
multiple R-UST tweaks and slight updates. this should fix any (all?) known outstanding bugs. i also modified values to be a bit more gameplay sensible (max average output on standard operating levels is ~150-200k per gen)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-27 02:04:44 +10:00
8e9c2670be
reduced smes starting power to 50%
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-26 19:23:28 +10:00
353396f2cc
tripled default computer power usage, tripled default machinery power usage (both active and idle), doubled emp power drain, tripled SMES starting power (from 30% to 90%)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-26 18:54:46 +10:00
f5a641211f
Merge pull request #1514 from SkyMarshal/master
...
ZAS is now even more reliable, being capable of working properly in all situations I was able to throw at it. Increases specific heat of all normal gases to increase sensitivity of players to heat differences.
2012-07-25 11:33:56 -07:00
113d4c67bf
Update code/modules/mob/living/parasite/meme.dm
...
Meme: Dumped the cost of Thought from 150 to 50
2012-07-25 20:33:25 +03:00
4fe2b585a7
Adds further checking and variable presets to ZAS, and made the contamination overlay actually work.
2012-07-24 22:12:25 -07:00
e859d51601
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-07-24 11:24:08 -07:00
f250b8de1b
added blue tiled floors to medbay lobby, added purple tiles to areas of research and the hallway adjoining research, remapped the anomaly hallway and research dock, remapped the research outpost dock, added todo note for a future cycling airlock update
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-07-25 02:15:47 +10:00
cf2a52a50c
Whoops.
2012-07-24 00:43:41 -07:00
76f77cb3e9
EXPERIMENTAL CHANGE: Increased heat capacity of normal gases, to make extreme temperatures more dangerous. THIS MAY HAVE UNINTENDED CONSEQUENCES.
2012-07-24 00:38:58 -07:00
6412692748
Fixed humans not being affected by temperature.
2012-07-23 23:44:43 -07:00
95ab92c0a6
Merge pull request #1510 from Abi79/master
...
Minor optimization to metroid/proc/get_obstacle_ok
2012-07-23 23:10:15 -07:00
d09d744f7f
Made the adminhelps sent to the IRC lack the HTML, and made PLASMAGUARD actually work.
2012-07-23 21:32:35 -07:00
4eee0a106c
Minor optimization to metroid/proc/get_obstacle_ok() and re-added Sky's beam optimization
2012-07-23 18:43:43 +03:00
cfabe7be97
Re-added deletion logging
2012-07-23 10:31:14 +03:00
188e7e3a2a
Revert "Optimized the code regarding the beam projectiles leaving a fleeting beam behind them, however the count of deletions is still quite high despite this. 30-50 deletions per second."
...
This reverts commit 45c8a37bd1
2012-07-22 23:35:38 +03:00
45c8a37bd1
Optimized the code regarding the beam projectiles leaving a fleeting beam behind them, however the count of deletions is still quite high despite this. 30-50 deletions per second.
...
Also fixed the code for evidence bags.
2012-07-20 22:04:00 -07:00
2a1404faac
More rigidly defined ZAS zone structures, so that connections work without flaw and rebuilding a zone will always produce the same shape. Also readded spess carp and fixed a compilation error.
2012-07-20 12:35:42 -07:00
c219463c2c
Merge pull request #1499 from Nerezza/istype
...
'Streamlining' the istype procs a little.
2012-07-20 09:43:26 -07:00
ebc6bf8897
Merge pull request #1500 from Nerezza/oxyreci
...
Added Oxycodone recipe
2012-07-20 09:42:50 -07:00
916b289c83
modified: code/modules/chemical/Chemistry-Recipes.dm
2012-07-20 10:40:05 -05:00
c840fa3698
modified: code/modules/mob/mob_helpers.dm
2012-07-20 08:53:23 -05:00
FireFishie