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
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
cfa1ff3440
Fixed Dionaea crashing on death
2014-08-10 01:00:26 -07:00
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
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
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
e7c4f09aad
capsaicin and condensedcapsaicin changes
...
turns them into pain dealing reagents instead of burndamage dealing
2014-08-10 02:47:24 +02:00
749bd6d3f2
Merge pull request #5920 from Jarcolr/patch-1
...
Move through blenders and pull blenders places
2014-08-10 04:00:11 +04:00
882d505824
Merge pull request #5917 from mwerezak/fix
...
Some fixes
2014-08-08 20:45:27 -05:00
30c96bc7cc
Fixes #5915
...
Also allows checking remaining engine charge by examining, and removes
the verb.
2014-08-08 20:31:14 -04:00
a3cbbe4d0b
Move through and pull blender
...
Changed density and anchored to 0.
2014-08-08 20:39:35 +03:00
00fcfa7899
Makes it possible to setup pAI configuration from the character setup screen.
2014-08-08 13:31:52 +02:00
8568a6aa89
Explicit proc/Topic definitions.
2014-08-08 13:21:51 +02:00
9f9865dac4
Merge pull request #5619 from mwerezak/power-net
...
ATMOSPHERICS and Power Net Overhaul
2014-08-08 09:49:42 +04:00
47b32122d4
Updates disposal bin pressurization
...
Also tweaks flasher power use.
2014-08-07 19:31:17 -04:00
4c6349f585
fixes #5914
...
user message blatantly stolen from /tg/ <3
2014-08-07 23:41:11 +02:00
a6c31bc5e8
Fixes xbow tension not being rest when fired
2014-08-07 17:06:01 -04:00
170e03d736
Fixes yank out object bloodying the wrong hands
2014-08-07 16:49:44 -04:00
7f89f891b6
Fixes icon not reverting when cycling a suit back
2014-08-07 16:30:21 -04:00
1384a93b59
Merge pull request #5904 from MrSnapwalk/icanseeeverything
...
Adds toggleable goggles.
2014-08-07 10:02:34 +09:30
d4c06d0424
Fixes bad entry in rig/sprite_sheets_obj
2014-08-06 14:36:20 -04:00
mwerezak