mwerezak
e0965bc2cb
Implements inserting rags into booze bottles
2015-08-13 18:37:17 -04:00
mwerezak
b003e2f94c
Lowers the volume of eggs to 10
2015-08-13 18:37:15 -04:00
mwerezak
498253f056
Splashing atoms now causes a proportion of the chems to land on the target's loc
...
Splashing now differs from trans_to(). A proportion of the splashed chemicals will splash on the target's loc, until a turf is splashed.
2015-08-13 18:37:15 -04:00
mwerezak
880f82935f
Implements lighting rags on fire
...
Rags can be lit on fire if soaked with welder fuel. While lit, the rag provides light, starts fires, and attacking mobs will ignite them.
Rags can be put out by clicking in hand.
Rags will burn out after a short time, turning into ash.
2015-08-13 18:37:14 -04:00
mwerezak
b5425e0bd9
Makes beer and ale bottles into actual bottles, adjusts bottle smashing
...
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
2015-08-13 18:37:13 -04:00
mwerezak
7198f98058
Improves support for rags as reagent containers
...
Rags now hold just under half a glass worth of reagents.
Fixes rags wiping down a mob while smothering them.
Rags can now be wrung out over a container or the floor, emptying it's
contents.
When wiping down stuff, a small amount of the rag's contents are
splashed onto the atom.
2015-08-13 18:32:51 -04:00
mwerezak
5ae15e222c
Bottles smash when thrown using harm intent
...
Throwing a glass bottle at something nearby on harm intent causes it to smash, splashing it's contents over whatever it hits.
If the hit atom is too far away the bottle will not smash. Also it does not smash with 100% reliability.
2015-08-13 18:32:50 -04:00
Chinsky
cce6c3ce2d
Merge pull request #10026 from Zuhayr/dronehats
...
Added hats for drones.
2015-08-13 17:49:03 +03:00
Chinsky
3b500d4076
Merge pull request #10279 from Kearel/LibraryModifications
...
Library modifications
2015-08-13 17:47:16 +03:00
Zuhayr
cc340831e2
Merge pull request #10304 from GinjaNinja32/follow
...
Better follow code
2015-08-13 18:39:20 +09:30
Zuhayr
4674333143
Minor holder refactor.
2015-08-13 17:31:42 +09:30
Zuhayr
ab49ac0d6d
Adds hats to dionaea.
2015-08-13 17:31:41 +09:30
Zuhayr
2f6a1f2830
Added hats for drones.
2015-08-13 17:31:40 +09:30
PsiOmegaDelta
0d7b2570db
Merge pull request #10604 from PsiOmegaDelta/dev
...
Dev
2015-08-13 09:20:31 +02:00
PsiOmegaDelta
9c737b628a
Updates changelog.
2015-08-13 09:11:50 +02:00
PsiOmegaDelta
efef67a3e4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-13 09:11:05 +02:00
PsiOmegaDelta
a81e359f8f
Merge pull request #10603 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-08-13 09:10:10 +02:00
PsiOmegaDelta
1b10f78940
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-08-13 09:01:10 +02:00
PsiOmegaDelta
bb8dc63478
Merge pull request #10408 from GinjaNinja32/client_dir
...
Lots and lots of client.dir fixes
2015-08-13 08:22:32 +02:00
Kearel
93959dc83d
Changelog + scrambled paper
2015-08-13 01:16:00 -05:00
GinjaNinja32
7d4a3b66e4
Reverts accidentally-commited test map
2015-08-13 06:43:30 +01:00
GinjaNinja32
477a9b8dba
Merge remote-tracking branch 'upstream/dev' into client_dir
2015-08-13 05:55:05 +01:00
GinjaNinja32
f52d48c91f
Merge remote-tracking branch 'upstream/dev' into follow
...
Conflicts:
.travis.yml
2015-08-13 05:54:30 +01:00
Chinsky
ac80136603
Merge pull request #10184 from mwerezak/projectile-cleanup
...
Projectile code cleanup
2015-08-13 07:26:58 +03:00
Chinsky
6781e05bd6
Merge pull request #10086 from mwerezak/arrows
...
Adds the ability to draw arrows with crayon
2015-08-13 07:24:03 +03:00
Chinsky
f7ccf47f06
Merge pull request #10030 from GinjaNinja32/languages
...
Reworks character creation language selection
2015-08-13 07:23:44 +03:00
Chinsky
89659c99fc
Merge pull request #10001 from PsiOmegaDelta/150702-MaskRefactor
...
Refactors mask voice changes.
2015-08-13 07:23:27 +03:00
Chinsky
562eba574d
Merge pull request #10000 from Kearel/voxSprites
...
Vox sprites to dev version
2015-08-13 07:23:17 +03:00
Chinsky
3fd8627bd7
Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup
...
Refactors gas analyzation.
2015-08-13 07:23:10 +03:00
Chinsky
81932abb29
Merge pull request #9995 from PsiOmegaDelta/150630-AddingThatMissing24GHour0ItIsDrivingMeInsaneAlright
...
Time padding.
2015-08-13 07:23:05 +03:00
Chinsky
2b965d7cd7
Merge pull request #9907 from Zuhayr/windowspawner
...
Ported window spawner, tyvm WrongEnd
2015-08-13 07:22:58 +03:00
Chinsky
fc14ec9fca
Merge pull request #9883 from mwerezak/ert-lights
...
Adds more coloured lights
2015-08-13 07:22:45 +03:00
Chinsky
ee387d8fb6
Merge pull request #10171 from orelbon/7-13-15_HoP_suit_edit
...
HoP Suit resprite
2015-08-13 07:22:36 +03:00
Chinsky
21f7c8234d
Merge pull request #10473 from mwerezak/firemode-cleanup
...
Streamlines gun fire modes
2015-08-13 07:22:28 +03:00
GinjaNinja32
98c2a0c8b1
Merge pull request #10594 from mwerezak/embed-fix
...
Embedding and broken limb fixes
2015-08-13 04:52:20 +01:00
mwerezak
1dc853710c
Implant items do not count for continuing to process embedded objects
...
Also makes embedded pain messages respect NO_PAIN.
2015-08-12 23:38:44 -04:00
Chinsky
0869e27310
Merge pull request #10492 from Baystation12/dev
...
Dev-Freeze 0.1.20 staging
2015-08-13 06:34:18 +03:00
GinjaNinja32
c70100e8bb
Merge pull request #10595 from mwerezak/mapping-fixes
...
Fixes toxins mass driver chamber not being enterable after use
2015-08-13 04:29:49 +01:00
mwerezak
99e1d88285
Fixes #10592
...
Fixes the right hand being affected if the left arm was broken.
2015-08-12 22:41:30 -04:00
mwerezak
62ad3a7be4
Fixes #10593
...
Adds a embedded_needs_process() proc to determine if the mob has embedded objects that still need to be processed. The get_visible_implants() remains to determine which implants can be seen on examine and yanked out.
2015-08-12 22:24:14 -04:00
Chinsky
6d4699fa32
Merge pull request #10590 from GinjaNinja32/debug
...
more debug stuff
2015-08-13 05:22:45 +03:00
Zuhayr
ca2c6cb656
Merge pull request #10586 from atlantiscze/commsfix2
...
Communications emergency-fix
2015-08-13 11:06:02 +09:30
GinjaNinja32
8d57f25fd5
Add a runtime-generating call to the "object was deleted via del() rather than qdel()" log, so we can get a stack trace from it
2015-08-13 01:51:40 +01:00
GinjaNinja32
83b26cf43a
Revert "Debug code to try to figure out the cause of the player-panel etc breaking"
...
This reverts commit 9dacc146cd .
2015-08-13 01:45:41 +01:00
Atlantis
f41387a57f
Communications emergency-fix
...
- Comments out buggy code that caused some telecommunication machines to introduce insane delay (up to 30s)
2015-08-13 00:07:32 +02:00
GinjaNinja32
792d6e2864
Merge pull request #10579 from mwerezak/misc
...
Fixes
2015-08-12 22:21:34 +01:00
HarpyEagle
74f9e6ce63
Fixes #10552
2015-08-12 16:45:45 -04:00
HarpyEagle
7a86d6e658
Fixes #10571
...
Adds another snowflake electronic item to the can_hold list.
2015-08-12 16:06:31 -04:00
HarpyEagle
19fbc71249
Removes req_amount from stack_recipe_list
...
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572 .
2015-08-12 15:54:16 -04:00
PsiOmegaDelta
c937cba330
Merge pull request #10575 from PsiOmegaDelta/dev
...
Dev
2015-08-12 21:33:52 +02:00