5e478b58e8
Fixes #10746
...
Stumps can now be amputated, but not removed by taking damage.
2015-09-09 00:17:37 -04:00
068d02c28c
Refactors various item attack() implementations
...
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
2015-09-08 23:39:33 -04:00
6ceffaacb5
Refactors item_attack.dm
...
Refactors and cleans up item_attack.dm and related mob attack code
2015-09-08 23:23:31 -04:00
30069d1dce
Merge pull request #11044 from Kelenius/beepskyFixes
...
Makes beepsky less brutal
2015-09-08 10:41:30 +02:00
388159c7f1
Makes beepsky less brutal
...
Fixes #10979
Fixes beepsky beating up handcuffed people
2015-09-08 11:36:55 +03:00
94b4c483ba
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
2f183e1cee
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
code/modules/nano/modules/human_appearance.dm
2015-09-08 07:58:25 +02:00
3a2b1be8e1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-07 08:09:01 +02:00
787f48146e
Merge pull request #10980 from GinjaNinja32/autohiss
...
Add autohiss/purr on a per-client toggle
2015-09-07 15:37:46 +09:30
8dea4d40c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-07 08:01:15 +02:00
211e426009
Tweak.
2015-09-07 14:43:20 +09:30
c2908bfc50
Fixes #10951
2015-09-07 14:43:12 +09:30
e27eda4c86
Merge pull request #10672 from mwerezak/frag-grenade
...
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
dd81250b1b
Merge pull request #10784 from Kelenius/masterRuntimes
...
Fixes two runtimes
2015-09-07 14:01:24 +09:30
e0cfd8fdbd
Merge pull request #10420 from Kearel/sbike
...
[Feature] Space Bikes!
2015-09-07 13:58:25 +09:30
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
fca95039bf
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/gamemodes/intercept_report.dm
code/game/gamemodes/traitor/traitor.dm
code/global.dm
code/modules/mob/inventory.dm
code/modules/mob/living/living.dm
html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
9d5f14298d
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/gamemodes/traitor/traitor.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
bedeb1fdff
Hopefully fixes some bugs that came out of that merge.
2015-09-06 20:00:01 -04:00
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
9533f2d154
Merge pull request #11026 from GinjaNinja32/announcement
...
Improve formatting of admin announcements
2015-09-07 01:02:36 +03:00
47f382b892
Merge pull request #11027 from Datraen/master
...
[BOTANY] Fixes plant nutrient storage unit check
2015-09-07 01:02:21 +03:00
3a5412df3a
Merge pull request #190 from PolarisSS13/master
...
Master to Dev 9/6/2015
2015-09-06 17:30:54 -04:00
a1b9dc2b4a
Resomi language tweaks, fixes every species' names being generated in Galcom
2015-09-06 22:10:39 +01:00
0451544692
Update nuclear.dm
2015-09-06 16:43:25 -04:00
05a29f8f3a
[BOTANY] Fixes plant storage nutrient check
...
Reported only high, low or none with previous system.
2015-09-06 16:42:58 -04:00
463ba53c3a
Adds system to describe how protective a piece of clothing is.
...
Also adds unused icons because byond won't let me use more than one per stat_icons.dm() proc. Hopefully someone finds a use for them later.
2015-09-06 15:52:46 -04:00
5a335c9140
Improve formatting of admin announcements
2015-09-06 20:41:06 +01:00
2563821832
Merge pull request #10972 from Zuhayr/resomi
...
Adds the Resomi.
2015-09-06 13:09:34 +03:00
ef21f562fd
Added some Resomi uniforms/loadout options.
2015-09-06 18:49:33 +09:30
63cb207eb8
Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys
...
Languages now use alternative prefix keys.
2015-09-06 17:20:51 +09:30
71d1853ede
Merge pull request #10993 from Zuhayr/species
...
Human subspecies.
2015-09-06 04:25:21 +03:00
12a0bae5bd
Stop resting when pAI chassis collapses
2015-09-05 21:53:21 +02:00
8685ff42a4
Merge pull request #11008 from Zuhayr/antaghud
...
Refactored the antagHUD to work better with the new antagonist system.
2015-09-05 17:01:57 +01:00
348f678b81
Merge pull request #10997 from PsiOmegaDelta/150904-RadioAccess
...
Observers can now view radio settings, admins can alter them.
2015-09-05 16:59:42 +01:00
ef208a55aa
Merge pull request #10996 from PsiOmegaDelta/150804-CrawlThroughThoseVents
...
Vent crawling now explicitly checks for equipped items.
2015-09-05 16:59:33 +01:00
f8bf428e66
Merge pull request #10981 from comma/technoir
...
MrSnapwalk's Detective Uniform Resprite
2015-09-06 00:48:50 +09:30
d03d9eebca
removing now unneeded limb define.
2015-09-06 00:42:54 +09:30
34a0c2f080
Added Resomi blood/damage masks.
2015-09-06 00:42:02 +09:30
3e015d7c71
Added three human subspecies.
2015-09-06 00:39:08 +09:30
808bbee90f
Added species vars for oxy/tox/rad/flash resistance.
2015-09-06 00:39:05 +09:30
90c9d31782
Refactored the antagHUD to work better with the new antagonist system.
2015-09-05 18:51:17 +09:30
95b12da391
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/gamemode.dm
code/game/antagonist/outsider/ert.dm
code/game/gamemodes/ninja/ninja.dm
2015-09-05 09:35:02 +02:00
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
2d91711fcc
Tail icons now use tail_hair var for overlays.
2015-09-05 16:07:24 +09:30
1c2cea708d
Mousedrop runtime fix.
2015-09-05 14:45:57 +09:30
34662a83b5
Merge pull request #10998 from Zuhayr/antagsystem
...
Antag system fixes.
2015-09-05 07:56:42 +03:00
f74182680c
Fixes autotraitor.
2015-09-05 13:15:30 +09:30
7af1f27b28
More debug feedback.
2015-09-05 12:57:20 +09:30
mwerezak