Chinsky
822d48928b
Fixes caps getting stuck in air forever.
...
Also apparently just being nodamage 0 damage non-sharp bullet is not enough to stop suicide from working -_-.
2015-08-14 06:19:35 +03:00
Chinsky
b01a41d766
Merge branch 'capgun' into russian_roulette
2015-08-14 06:03:33 +03:00
Chinsky
f5a59ecc9b
Compile fix
2015-08-14 06:00:22 +03:00
Chinsky
b4ec03b871
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette
2015-08-14 05:57:00 +03:00
Chinsky
26becb7e5b
changelog
2015-08-14 05:54:22 +03:00
Chinsky
328621b860
Moved cap guns to proper guns.
2015-08-14 05:51:29 +03:00
Chinsky
d9319f4712
changelog
2015-08-14 05:16:51 +03:00
Chinsky
54cb084113
Merge pull request #9997 from PsiOmegaDelta/150702-MoneyMoneyMoney
...
Economic strength now depends on race and job.
2015-08-14 03:56:57 +03:00
Chinsky
8c9d36e24a
Merge pull request #10197 from GinjaNinja32/gender
...
Changes gender-based words to use a datum list instead of switches.
2015-08-14 03:56:18 +03:00
Chinsky
94f0ceffe1
Merge pull request #10200 from mwerezak/gun-desc
...
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00
Chinsky
701515ae88
Merge pull request #10202 from mwerezak/20150713-molotov-cocktail
...
Rag and drink bottle improvements
2015-08-14 03:55:35 +03:00
Chinsky
c664ca6096
Merge pull request #10276 from mwerezak/uplink-items
...
Allows traitors the option of purchasing the C-20r or STS-35
2015-08-14 03:55:03 +03:00
HarpyEagle
fc252058e5
Updates changelog
2015-08-13 18:41:45 -04:00
Chinsky
c5d54ba454
Merge pull request #10455 from mwerezak/t-scanner
...
Adds client image based t-scanner
2015-08-14 01:39:36 +03:00
mwerezak
34bcc3143a
Fixes bad span
2015-08-13 18:37:18 -04:00
mwerezak
7dcd599a37
Allows bedsheets to be cut up into rags
2015-08-13 18:37:18 -04:00
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
HarpyEagle
c771c968b7
Updates changelog
2015-08-13 18:31:26 -04:00
HarpyEagle
bba3ae8165
Updates changelog
2015-08-13 18:30:32 -04:00
HarpyEagle
dcac8f0cc1
Updates changelog
2015-08-13 18:25:45 -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
PsiOmegaDelta
c63f4c62b5
Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney
...
Conflicts:
code/__defines/mobs.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job_controller.dm
2015-08-13 08:06:11 +02:00
GinjaNinja32
7d4a3b66e4
Reverts accidentally-commited test map
2015-08-13 06:43:30 +01:00
GinjaNinja32
b7964c2f4a
Missed a couple of t_ variables
2015-08-13 06:02:38 +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
GinjaNinja32
cde0f889c7
Merge remote-tracking branch 'upstream/dev' into gender
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
2015-08-13 05:52:51 +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
