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
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
afa878e993
Adjusts breacher desc, comments
2015-08-13 18:21:57 -04:00
mwerezak
1f7497063a
Merge pull request #10618 from GinjaNinja32/10617
...
fix #10617
2015-08-13 16:20:32 -04:00
GinjaNinja32
1d3a2c1a31
fix #10617
2015-08-13 21:01:46 +01:00
mwerezak
c4ed6a10aa
Merge pull request #10609 from PsiOmegaDelta/150813-ReagentQdel
...
qdel(reagent) adjustments.
2015-08-13 12:35:08 -04:00
PsiOmegaDelta
f95efdc0a1
Merge pull request #10612 from Raptor1628/master
...
Fixes Grenade Launcher module sprite again
2015-08-13 17:08:36 +02:00
Chinsky
cce6c3ce2d
Merge pull request #10026 from Zuhayr/dronehats
...
Added hats for drones.
2015-08-13 17:49:03 +03:00
Zuhayr
84678a91c1
Fixes roundend failing to scroll, fixes teams not getting shared global objectives.
2015-08-14 00:18:41 +09:30
Chinsky
3b500d4076
Merge pull request #10279 from Kearel/LibraryModifications
...
Library modifications
2015-08-13 17:47:16 +03:00
Raptor1628
0274f87172
Fixes Grenade Launcher module sprite again
...
It didn't stick last time, so let's go again!
2015-08-13 10:11:11 -04:00
Zuhayr
cc340831e2
Merge pull request #10304 from GinjaNinja32/follow
...
Better follow code
2015-08-13 18:39:20 +09:30
PsiOmegaDelta
d1e8f670b2
qdel(reagent) adjustments.
...
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00
PsiOmegaDelta
62155433c2
Merge corrections.
...
Fixes the todo:s I claimed I'd fix at merge.
2015-08-13 10:17:03 +02:00
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
Zuhayr
e362e13433
Merge pull request #10605 from PsiOmegaDelta/150813-TypoFix
...
Typo fix.
2015-08-13 17:01:25 +09:30
PsiOmegaDelta
e1db48e50f
Typo fix.
...
Minor typo fix: Unladed to unloaded.
2015-08-13 09:26:41 +02:00
PsiOmegaDelta
efef67a3e4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-13 09:11:05 +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
Kelenius
3b1b8a33c6
Merge branch 'dev' into ofSleepersAndNano
...
Conflicts:
maps/exodus-1.dmm
maps/exodus-2.dmm
maps/exodus-3.dmm
2015-08-13 09:49:34 +03:00
Kelenius
c1e3c73f7b
Tiny sleeper fix
2015-08-13 09:37:02 +03:00
PsiOmegaDelta
ccf6fa285d
Removes Flesh to Stone fully.
...
Fixes #10600 .
2015-08-13 08:25:03 +02:00
Kelenius
d8d94b9d64
Merge branch 'dev' into ofSleepersAndNano
...
Conflicts:
code/game/machinery/Sleeper.dm
maps/exodus-1.dmm
2015-08-13 09:20:51 +03: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
Kelenius
65a9e11a52
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
baystation12.dme
2015-08-13 08:33:46 +03: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
3fd8627bd7
Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup
...
Refactors gas analyzation.
2015-08-13 07:23:10 +03:00
