Commit Graph

8240 Commits

Author SHA1 Message Date
igalan
d4be0bfc87 Removed pure laziness comment line 2014-08-21 02:46:18 +01:00
igalan
031d5070fc Cleans up chem dispenser code by taking out the unused broken_on_spawn var. And frankly, if we wanted that feature, it would be done in other way. 2014-08-21 01:02:54 +01:00
Walter0o
eb7c2aa9c5 should fix #6065 2014-08-19 17:26:10 +02:00
Ccomp5950
25506f33fa Merge pull request #6032 from Walter0o/low_pressure_fix
fixes #6005 and broken ancient human low/high pressure code.
2014-08-19 05:54:30 -05:00
Whitellama
7ced8104ca Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/items/devices/transfer_valve.dm
2014-08-17 17:50:07 -07:00
Zuhayr
8ec28551ba Merge pull request #6022 from mwerezak/docking
Fixes for docking controllers, emergency shuttle and airlock animations
2014-08-18 09:30:17 +09:30
Zuhayr
2033923f8f Merge pull request #6018 from Hubblenaut/master
Patch of fixes for bugs and oversights
2014-08-18 09:28:17 +09:30
Whitellama
09907858f3 Added fingerprints and logs when wrenching fuel tanks, and added JMP buttons to logs regarding fuel tanks. 2014-08-17 15:51:01 -07:00
JimTheCactus
e74d92370d Added a forced, immediate refresh of the icons after the character is made.
This eliminates a race condition between spawning in and the icon cache being updated to include the body.
2014-08-17 12:34:02 -06:00
Walter0o
e8592d4f41 fixes #6005 and broken ancient human low/high pressure code.
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
2014-08-17 18:06:30 +02:00
Whitellama
f1494c9b76 Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them. 2014-08-17 02:48:08 -07:00
mwerezak
d8b6aecc32 Fixes escape shuttle announcing a negative ETA
Fixes the escape shuttle announcing a negative ETA when it leaves late.
2014-08-16 21:02:05 -04:00
mwerezak
2bd96ab29e Fixes multi docking port undocking conditions
The undocking conditions for multidocking ports (used by the escape
shuttle) were overly strict, failing if any door was open/unlocked.
Changed to allow undocking if at least one of the inner or outer doors
can close and lock.
2014-08-16 20:50:34 -04:00
Hubblenaut
d122ec9979 Sleeping people on chairs can be woken up 2014-08-17 02:34:26 +02:00
Hubblenaut
1602cb883c Surgical tools that are nowhere near the patient don't cause a fail step 2014-08-17 02:34:25 +02:00
Hubblenaut
cbb0a3c0b7 Fixes a surgery oversight regarding text coloring 2014-08-17 02:21:32 +02:00
Hubblenaut
48655479b7 Hardcrit is entered immediately and lasts for 300 seconds instead of 250 (at max) 2014-08-17 02:21:31 +02:00
Hubblenaut
15ae5ca2a9 Adds JMP button to certain admin logs 2014-08-17 02:21:21 +02:00
Ccomp5950
9f57c1b16e Merge pull request #6012 from Walter0o/gear_fix
fixes #6007 and future bugs with gear names
2014-08-15 20:08:25 -05:00
Chinsky
919ecc2a16 Merge pull request #5998 from Walter0o/gripper_fix
fixes #5693
2014-08-16 03:47:51 +04:00
Walter0o
a3848871d4 fixes #6007 and future bugs with gear names 2014-08-15 11:11:13 +02:00
Walter0o
de37978995 comment adjustment according to feedback 2014-08-15 06:19:55 +02:00
Chinsky
7351767ef7 Merge pull request #5983 from atlantiscze/co2-breath-fix
CO2 Breath fix
2014-08-14 22:58:22 +04:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2
More proximity fixes
2014-08-14 22:55:29 +04:00
Walter0o
7236995b0e fixes #5693 2014-08-14 11:13:12 +02:00
Chinsky
bcf0a57aa0 Merge pull request #5962 from mwerezak/wound-fixes
Wound and infection fever fix
2014-08-14 07:55:17 +04:00
Zuhayr
e1953c66cc Merge pull request #5995 from Hubblenaut/master
More admin logs, Rejuvenation fix
2014-08-14 12:16:42 +09:30
Zuhayr
8b3631e6d5 Merge pull request #5972 from Walter0o/psu_fix
fixes #5964
2014-08-14 12:03:59 +09:30
Zuhayr
04bf4c7d90 Merge pull request #5981 from Walter0o/sound_removal
removes unused AI text2speech files and code
2014-08-14 12:02:10 +09:30
Hubblenaut
330ce5d088 Fixes rejuvenation ignoring infections 2014-08-14 01:55:30 +02:00
Hubblenaut
c80b921d6b Logs finishing tank transfer valve bombs and ghosting. Changes pAI request
to state the name of the inquirer.
2014-08-14 01:07:09 +02:00
Atlantiscze
ee3072019a Revert "N2 buildup fix attempt. Putting this into separate commit in case it's not wanted."
This reverts commit e8a7b58aff.
2014-08-13 23:42:58 +02:00
mwerezak
0b0380ae14 Fixes burn description saying it is salved when not 2014-08-13 17:11:25 -04:00
mwerezak
ca9fc4169d Fixes infection fever causing burn damage 2014-08-13 17:11:03 -04:00
GinjaNinja32
d1fc12e1c7 More proximity fixes 2014-08-13 20:58:49 +01:00
Walter0o
94ec887a75 removes unused AI text2speech files and code,
saves about 4.5 MB traffic per client.
2014-08-13 11:24:23 +02:00
Atlantiscze
e8a7b58aff N2 buildup fix attempt. Putting this into separate commit in case it's not wanted.
- Right now, air consists of 20% O2 80% N2 (approx.). Breathing takes O2 and turns it into CO2. CO2 gets scrubbed. Pressure drops, vents refill with air which again contains 80% N2 20% O2.
- This means that only 20% of breathed-out oxygen is replenished. Rest is replaced by N2. In large areas, such as Bar, with many mobs this can eventually lead to dangerous atmosphere status.
- This fix, while OOCly slightly unrealistic handles this issue by turning both O2 and N2 into CO2. Tested in CE's office with 5 human mobs without active scrubbers. Air lasts for 2~ hrs. Larger areas of course last significantly longer.
2014-08-13 11:24:12 +02:00
Atlantiscze
ce2e34f5e5 - Fixes breathing not producing CO2. This applied to humans (untested for other races, but probably the same) 2014-08-13 09:02:49 +02:00
Walter0o
473a570b23 fixes #5970, prevents bugs in the future
this is not an issue at the moment but will become one should maxHealth ever get changed.
2014-08-13 03:43:30 +02:00
Walter0o
9421b4b48e fixes #5964 2014-08-13 03:38:41 +02:00
Zuhayr
70c016814c Merge pull request #5955 from Walter0o/chem_reag_fix
fixes #5919 and some other reagent issues
2014-08-13 00:40:01 +09:30
mwerezak
44cc7159c4 Fixes a few issues with get_wound_type()
Fixes damage causing "healing" wound types that can't bleed.
Fixes flesh wounds not bleeding the instant they heal any damage.
2014-08-11 21:37:34 -04:00
Walter0o
26ae447079 removes pointless has_reagent() checks
remove_reagent() iterates safely through the holder list already,
unless you need to check a minimum amount,
or simply want to know if it is present, the call is not needed.
2014-08-11 13:01:27 +02:00
Walter0o
342fbdd136 fixes #5919 and some other reagent value issues
negative values everywhere.
2014-08-11 12:46:43 +02:00
Walter0o
09d2acee62 fixes #5923
and a few other range issues
2014-08-11 04:45:50 +02:00
Ccomp5950
ceeb389a55 Merge pull request #5948 from mwerezak/train
Fixes runtime in train/explode()
2014-08-10 18:53:27 -05:00
Ccomp5950
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
mwerezak
8482314541 Fixes runtime in train/explode() 2014-08-10 18:37:39 -04:00
Chinsky
06aa6ab798 Merge pull request #5937 from Walter0o/patch-4
capsaicin and condensedcapsaicin changes
2014-08-11 01:57:24 +04:00
Chinsky
7df146ba2a Merge pull request #5924 from mwerezak/train
Fixes #5915
2014-08-11 01:57:02 +04:00