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
Chinsky
573f49624e
Added suggested new type of wounds for stumps
2014-08-12 19:48:17 +04: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
iamgoofball
88c034a30b
Ports the "Family Man" Hair Pack from /vg/station.
2014-08-11 13:25:57 -07: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
PsiOmega
c3de9ca3c7
Fixes #5946 and cuts down on duplicate code across Life() procs.
2014-08-11 10:42:32 +02:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Walter0o
09d2acee62
fixes #5923
...
and a few other range issues
2014-08-11 04:45:50 +02:00
Zuhayr
54ec5f0233
Attempting to fix a very weird overlay error, refactoring some shit mining code.
2014-08-11 11:42:16 +09:30
Zuhayr
beaad5a37b
Merged in preferences file changes, changed None to Unset for home system.
2014-08-11 10:38:01 +09:30
Zuhayr
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
Chinsky
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
Ccomp5950
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
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
mwerezak
03e557823c
Fixed #5912
...
Also fixes hydroponics trays not updating
2014-08-10 16:29:09 -04:00
Whitellama
c87ad570f8
Cult tomes can't be destroyed with ethanol
2014-08-10 12:50:53 -07:00
mwerezak
58e0b659d4
Reorganizes shieldgen source code and icon files
2014-08-10 11:58:25 -04:00
Whitellama
49c8c6f2cb
Made arcane tomes a subtype of books, fixes #5838
2014-08-10 02:23:36 -07:00
Jarcolr
2db24a17d5
Typo
2014-08-10 11:57:40 +03:00
Jarcolr
4666966dab
Fixes 2 broken custom items, adds 1 new one
...
Fixes hazard hardsuit icon_state, paper icon_state missing for an item,
removed krinn_hatt from obj/clothing/hats.dmi since it's defined to be
in custom_items.dmi and added MiT labcoat
2014-08-10 11:49:14 +03:00
Whitellama
cfa1ff3440
Fixed Dionaea crashing on death
2014-08-10 01:00:26 -07:00
mwerezak
e1dc7d436b
Fixes icons and other things not updating when the master controller updates power status.
...
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
mwerezak
4b070a2de6
Fixes #5935
...
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
2014-08-10 03:44:56 -04:00
mwerezak
213b11601e
Updates emitters and containment field power usage
...
As well as PA power usage. It's not used at the moment, but it might be
used by downstream or in the future.
2014-08-10 00:40:58 -04:00
Walter0o
e7c4f09aad
capsaicin and condensedcapsaicin changes
...
turns them into pain dealing reagents instead of burndamage dealing
2014-08-10 02:47:24 +02:00
Chinsky
749bd6d3f2
Merge pull request #5920 from Jarcolr/patch-1
...
Move through blenders and pull blenders places
2014-08-10 04:00:11 +04:00
Ccomp5950
882d505824
Merge pull request #5917 from mwerezak/fix
...
Some fixes
2014-08-08 20:45:27 -05:00
mwerezak
30c96bc7cc
Fixes #5915
...
Also allows checking remaining engine charge by examining, and removes
the verb.
2014-08-08 20:31:14 -04:00
Jarcolr
a3cbbe4d0b
Move through and pull blender
...
Changed density and anchored to 0.
2014-08-08 20:39:35 +03:00
PsiOmega
00fcfa7899
Makes it possible to setup pAI configuration from the character setup screen.
2014-08-08 13:31:52 +02:00
PsiOmega
8568a6aa89
Explicit proc/Topic definitions.
2014-08-08 13:21:51 +02:00
Chinsky
9f9865dac4
Merge pull request #5619 from mwerezak/power-net
...
ATMOSPHERICS and Power Net Overhaul
2014-08-08 09:49:42 +04:00
mwerezak
47b32122d4
Updates disposal bin pressurization
...
Also tweaks flasher power use.
2014-08-07 19:31:17 -04:00
Walter0o
4c6349f585
fixes #5914
...
user message blatantly stolen from /tg/ <3
2014-08-07 23:41:11 +02:00
mwerezak
a6c31bc5e8
Fixes xbow tension not being rest when fired
2014-08-07 17:06:01 -04:00
mwerezak
170e03d736
Fixes yank out object bloodying the wrong hands
2014-08-07 16:49:44 -04:00
mwerezak
7f89f891b6
Fixes icon not reverting when cycling a suit back
2014-08-07 16:30:21 -04:00
Zuhayr
1384a93b59
Merge pull request #5904 from MrSnapwalk/icanseeeverything
...
Adds toggleable goggles.
2014-08-07 10:02:34 +09:30
mwerezak
d4c06d0424
Fixes bad entry in rig/sprite_sheets_obj
2014-08-06 14:36:20 -04:00
MrSnapwalk
96849c6de4
Adds a feedback message for toggling goggles.
2014-08-05 21:28:16 -05:00
MrSnapwalk
507b173d11
Adds toggleable goggles.
2014-08-05 21:24:45 -05:00
Chinsky
2b94441555
Merge pull request #5899 from Ccomp5950/fueltanks-yay
...
Fueltanks now log and admin_msg when shot at / weldered
2014-08-06 03:13:25 +04:00
Zuhayr
00fc8c53ba
Merge pull request #5898 from Walter0o/patch-1
...
fixes #5876
2014-08-05 13:22:26 +09:30
