eab2ef935b
Fixed copypaste derp resulting in runtime when you are naked sans gloves.
2014-08-27 03:41:11 +04:00
677ac1f7bb
Merge pull request #6051 from comma/detcomp
...
Initial commit of detective console rewrite.
2014-08-19 21:46:52 +09:30
3c19520df2
Merge pull request #6059 from mwerezak/power-net
...
Fixes APCs eating up all the power even when fully charged
2014-08-19 06:02:34 -05:00
3c9fa8ba61
Merge pull request #6050 from mwerezak/breathing
...
Simplifies handling of inhale_pp
2014-08-19 05:52:37 -05:00
1cfc3b8d5f
Fixes APCs eating up all the power even when fully charged
2014-08-19 01:14:18 -04:00
b43759fee9
Initial commit of detective console rewrite.
...
Changed forensic data to use record datum instead of unreadable arrays.
Now handheld scanner transfers data by clicking the big console, not by scan.
Rewrote high res scanner console. Now it leaves compiling dossiers to player, via use of filters.
2014-08-19 00:50:14 +04:00
f9b4a78405
Fixes exhaling/inhaling types, cleanup
2014-08-18 14:58:18 -04:00
b04ac56d45
Cleanup/adjustment of inhale_pp handling
2014-08-18 13:33:51 -04:00
65a31f2dc2
Merge pull request #6026 from mwerezak/internal-bleeding
...
Implements IB changes discussed in forum thread
2014-08-18 09:32:00 +09:30
6679434713
Merge pull request #6024 from mwerezak/laser
...
Adjusts laser cannon damage
2014-08-18 09:29:27 +09:30
2a6a312dbe
Merge pull request #6019 from mwerezak/radio
...
Fixes machines being able to put the Radio Controller to sleep + Radio Controller cleanup
2014-08-18 09:25:24 +09:30
4740898b23
Merge pull request #6016 from comma/rads
...
Rad damage changes
2014-08-18 09:24:49 +09:30
c660734299
Added probability scaling for non-damage events.
...
Fixed typo.
2014-08-17 11:05:17 +04:00
bd397ff844
Adjusts laser cannon damage
...
Increased laser cannon damage to be higher than regular laser damage.
Also updated the name var of /laser/captain so that it doesn't inherit
"laser carbine"
2014-08-16 22:34:23 -04:00
5b341bd810
IB initial damage now depends on damage taken
...
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
add9ec3b65
Makes IB bleed with same rate as external bleeding
...
Also updates drip() to remove the amount of blood actually passed into
it as argument.
2014-08-16 21:45:21 -04:00
09561db2d0
Added coefficient to scale speed of rads. Currently it's 10x slower than it was.
...
Added humans going bald on high rads levels.
Added a chance to get sick burn on highest rad level.
Replaced mutations (turning deaf/blind is unfun, and slowing rads would raise the chance of it happening) with a a chance of small genetic damage.
2014-08-16 09:32:24 +04:00
1de0e2cb44
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea
...
Conflicts:
maps/tgstation2.dmm
2014-08-16 06:29:55 +04:00
f71e43d06c
Moved ambiance sounds out of horrendous ifchain to area definitions.
...
Changed ambiance spamcheck to use time instead of 10 minute spawn.
2014-08-16 04:40:46 +04:00
9d7c5dc197
Gives filters proper names, updates airlocks to use filters
...
Docking ports still don't use filters though, as it would mess with the
docking ports that are also airlocks. Docking is infrequent though so it
should be fine.
2014-08-15 20:27:00 -04:00
d399fb610d
Renames "laser gun" to "laser carbine"
2014-08-14 22:59:18 -04:00
46a50dc7a2
Removes the loophole ion-law. Adds in some other ion law changes.
2014-08-14 11:20:45 +02:00
6fffe8e077
Merge remote-tracking branch 'upstream/dev' into Brig2
2014-08-14 08:58:59 +02:00
658941a0f9
Merge pull request #5978 from Zuhayr/journalism
...
Mining changes and basic character backgrounds.
2014-08-14 10:54:49 +04:00
e23d47e6c2
Merge pull request #5996 from MrSnapwalk/hairhaireverywhere
...
Adds more new hair.
2014-08-14 06:30:24 +04:00
4deeacc809
Merge pull request #5950 from comma/hurties
...
Hurties
2014-08-14 11:59:39 +09:30
6b44ef8ff1
Adds new hair.
2014-08-13 20:15:07 -05:00
1c5e944ce5
Merge pull request #5954 from Zuhayr/dev
...
No one is going to read this all anyway
2014-08-13 18:33:09 +04:00
688cf22a67
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-08-13 17:10:37 +09:30
2a46b83dce
Adds new items. Source: https://github.com/Baystation12/Baystation12/pull/5928
2014-08-13 09:35:04 +02:00
649af28c77
Fixed the overlay issue for now. This will need replacing.
2014-08-13 12:04:51 +09:30
573f49624e
Added suggested new type of wounds for stumps
2014-08-12 19:48:17 +04:00
88c034a30b
Ports the "Family Man" Hair Pack from /vg/station.
2014-08-11 13:25:57 -07:00
c3de9ca3c7
Fixes #5946 and cuts down on duplicate code across Life() procs.
2014-08-11 10:42:32 +02:00
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
54ec5f0233
Attempting to fix a very weird overlay error, refactoring some shit mining code.
2014-08-11 11:42:16 +09:30
beaad5a37b
Merged in preferences file changes, changed None to Unset for home system.
2014-08-11 10:38:01 +09:30
a2945a00d7
Merge pull request #5940 from mwerezak/power-net
...
Update for shield generator power use and power net fixes
2014-08-11 10:13:26 +09:30
dddaab172c
Made missing limbs not process.
...
Moved code in processing so that ORGAN_DESTROYED limbs won't process wounds and chemicals. They still need to process once to actually fall off (too lazy to change that)
Made dropping limbs remove all wounds and germs. Instead, one big wound is spawned on parent organ. Damage depends on the organ.
Removed missing limbs bleeding on their own, since that's what that wound is for now.
They still would ache until surgically mended anyway.
Fixed possible issue with amputation not fixing the rotten limb.
2014-08-11 04:35:45 +04:00
a44a9b2d61
Merge pull request #5942 from Jarcolr/customs
...
Fixes 2 broken custom items, adds 1 new one and removes duplicate icon_state file
2014-08-10 18:54:36 -05:00
ceeb389a55
Merge pull request #5948 from mwerezak/train
...
Fixes runtime in train/explode()
2014-08-10 18:53:27 -05:00
06da9e8070
Merge pull request #5941 from Whitellama/master
...
Fixes #5577 , Dionaea crashing on death. Fixes #5838 , tomes not being able to be stored on bookshelves."
2014-08-10 18:53:11 -05:00
8482314541
Fixes runtime in train/explode()
2014-08-10 18:37:39 -04:00
06aa6ab798
Merge pull request #5937 from Walter0o/patch-4
...
capsaicin and condensedcapsaicin changes
2014-08-11 01:57:24 +04:00
7df146ba2a
Merge pull request #5924 from mwerezak/train
...
Fixes #5915
2014-08-11 01:57:02 +04:00
03e557823c
Fixed #5912
...
Also fixes hydroponics trays not updating
2014-08-10 16:29:09 -04:00
c87ad570f8
Cult tomes can't be destroyed with ethanol
2014-08-10 12:50:53 -07:00
58e0b659d4
Reorganizes shieldgen source code and icon files
2014-08-10 11:58:25 -04:00
49c8c6f2cb
Made arcane tomes a subtype of books, fixes #5838
2014-08-10 02:23:36 -07:00
2db24a17d5
Typo
2014-08-10 11:57:40 +03:00
Chinsky