Xaltonon
c9f3eea32c
CMO and paramedic access tweaks
2014-08-27 22:49:22 -07:00
ZomgPonies
770818f336
Merge pull request #402 from VampyrBytes/master
...
Cleanup of internal organs
2014-08-21 16:11:52 -04:00
Bone White
80d3bff885
Fixes a minor bug with pipe laying
2014-08-21 11:23:55 +01:00
VampyrBytes
c0f5132664
Cleanup of internal organs
...
Both internal and external organs are a mess, which is making
maintaining and updating them nasty, so I'm cleaning them up, this is
the first stage
mechanical and assisted internal organs are now an object type rather
than a var in the organ which makes it much cleaner and easier to adjust
removed duplicate list of internal organs as there's no reason to have
the same objects in 2 separate lists
made New() a lot cleaner and more robust
External organs will be next
2014-08-21 10:24:13 +01:00
VampyrBytes
32b6eb9813
Revert "fix for runtime caused by #398 "
...
This reverts commit 98a0e85227
2014-08-21 10:09:34 +01:00
VampyrBytes
98a0e85227
fix for runtime caused by #398
...
God knows why this was a var/tmp
2014-08-20 14:04:07 +01:00
ZomgPonies
6ebb6d617e
Merge pull request #399 from Bone-White/master
...
Rigid suit equip delay rework
2014-08-20 03:07:09 -04:00
ZomgPonies
f4b6450a20
Merge pull request #398 from VampyrBytes/master
...
IPC and nuke disk fixes
2014-08-20 03:07:01 -04:00
Bone White
b5fcd209b2
Rigid suit equip delay rework
...
now uses a couple of new procs, allowing for per-suit tweaking of time.
You now cannot equip eva helms without first attaching them to the suit
(target head use helmet on suit)
2014-08-20 07:28:44 +01:00
VampyrBytes
5b8253fb57
IPC and nuke disk fixes
...
Fix for IPC revival
Prevents nuke disk from being inserted via cavity surgery
2014-08-19 07:06:12 +01:00
ZomgPonies
983d78b775
Merge pull request #395 from IcyV/chemistry
...
Nerfs how effective Tramadol and Oxycodone are
2014-08-18 19:20:20 -04:00
ZomgPonies
b314db6296
Merge pull request #394 from VampyrBytes/master
...
Genetics fixes
2014-08-18 19:19:58 -04:00
ZomgPonies
7139b92b47
Merge pull request #393 from Bone-White/master
...
Diona speed fix
2014-08-18 19:19:05 -04:00
IcyV
60e2785e28
Nerfs how effective Tramadol and Oxycodone are
...
Reduces the amount of shock that they can tolerate to adjust with the new combat changes.
2014-08-18 08:43:13 -07:00
Bone White
d2129341b9
Adds equip/unequip times to rigid suits
...
Also stops helmets being worn without the rigid suit already on the mob.
2014-08-18 08:16:06 +01:00
Bone White
9ec8db00f6
Diona speed fix
...
was broken by my eva suit slowdown alterations, now fixed.
2014-08-17 09:49:11 +01:00
ZomgPonies
ebc3098f45
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-08-16 21:48:27 -04:00
Walter0o
8f27fc38a9
comment adjustment according to feedback
2014-08-16 21:47:19 -04:00
Walter0o
6f790b6edf
fixes #5693
2014-08-16 21:47:09 -04:00
mwerezak
f62aeee76e
Fixes #6002
2014-08-16 21:46:45 -04:00
ZomgPonies
ed484b68aa
Compile fix
2014-08-16 21:45:36 -04:00
GinjaNinja32
bf3d3cf04a
Use absolute paths
2014-08-16 21:44:27 -04:00
GinjaNinja32
52b0de9928
Use \the macro
2014-08-16 21:44:10 -04:00
GinjaNinja32
0427641d89
Moved all shard code to one file. Fixed #5992
...
Conflicts:
code/defines/obj/weapon.dm
code/game/objects/items/stacks/sheets/glass.dm
2014-08-16 21:43:38 -04:00
Atlantiscze
cda96551f1
Fixes #5974
...
- Fixes possible disappearance bug for Laptops
2014-08-16 21:37:16 -04:00
Walter0o
ebbeaef854
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-16 21:36:34 -04:00
Walter0o
0c02bd02dd
fixes #5964
2014-08-16 21:36:22 -04:00
mwerezak
ab0f0db923
airlock/arePowerSystemsOn() refactor
...
airlock/arePowerSystemsOn() now checks if the airlock has power in
addition to the wires being intact.
Conflicts:
code/game/machinery/doors/airlock.dm
2014-08-16 21:34:30 -04:00
mwerezak
e44dbfcc4e
Fixes #5953
...
Conflicts:
code/game/machinery/doors/airlock.dm
2014-08-16 21:30:47 -04:00
ZomgPonies
4567a6d607
WTF in world
2014-08-16 21:29:15 -04:00
Lancer411
72aac48662
Checks for SMES Z level at power_failure.dm
...
Little fix which checks Z level of SMES before drying it up at grid_check event.
2014-08-16 21:27:35 -04:00
Lancer411
b2acb96393
Fixes for grid_check random event.
...
There was an issue, when APC with removed cell in area was powered at power_restore() proc, making area allways powered despite APC was not working.
Removed part of code which unpowers area directly, bypassing the APC process code. This makes grid_check event less laggy and smooth. Downside is lights not being shut down immediatly.
AI SMES still not being affected after this fix.
Conflicts:
code/game/gamemodes/events/power_failure.dm
2014-08-16 21:27:26 -04:00
mwerezak
547fada4df
Fixes burn description saying it is salved when not
2014-08-16 21:23:56 -04:00
mwerezak
15a6b95112
Fixes infection fever causing burn damage
2014-08-16 21:23:47 -04:00
mwerezak
8d04e8b9c6
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-16 21:23:36 -04:00
mwerezak
df900e05cb
Adjusts train supply costs
2014-08-16 21:23:10 -04:00
ZomgPonies
8c965ec9c1
Compile fix
2014-08-16 21:22:21 -04:00
PsiOmega
6158805a68
Fixes #5946 and cuts down on duplicate code across Life() procs.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/mob.dm
2014-08-16 21:18:18 -04:00
Chinsky
ab1fdeae25
Added suggested new type of wounds for stumps
2014-08-16 21:13:12 -04:00
Chinsky
1f55a8c491
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.
Conflicts:
code/modules/organs/organ_external.dm
2014-08-16 21:13:00 -04:00
mwerezak
af0ab6fc5c
Fixes runtime in train/explode()
2014-08-16 21:10:23 -04:00
mwerezak
183c25167c
Fixes #5915
...
Also allows checking remaining engine charge by examining, and removes
the verb.
Conflicts:
code/modules/vehicles/cargo_train.dm
2014-08-16 21:08:25 -04:00
mwerezak
4b647c1905
Fixes xbow tension not being rest when fired
2014-08-16 20:58:58 -04:00
ZomgPonies
b06eb66ca4
Fix for bloody hands yanking shit
2014-08-16 20:58:37 -04:00
Ccomp5950
3ca02d3c5b
Fixed the font tag on mouse traps description.
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
2014-08-16 20:53:29 -04:00
ZomgPonies
88a95cc737
Merge pull request #390 from Bone-White/master
...
Removed two debug comments
2014-08-16 20:52:30 -04:00
Bone White
866db87ec0
Removed two debug comments
2014-08-17 00:43:54 +01:00
ZomgPonies
2cfe8a8765
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-08-16 18:12:53 -04:00
ZomgPonies
bdb35c7b3a
MySQL fixes
2014-08-16 18:12:44 -04:00
ZomgPonies
24b78b69be
Use absolute paths next time
2014-08-16 18:11:49 -04:00
