7f319f528a
Merge pull request #9875 from Zuhayr/dev-freeze
...
Antag system fixes
2015-06-21 12:07:50 +01:00
d3bd63eec9
Refactor/tidies up latejoin antags/in-round antag spawning.
2015-06-21 19:33:49 +09:30
ec5e05b9f1
Antagonist system refactor. Fixes #9495 , #9290 , #9521 , #8800 and #9465 .
2015-06-21 18:08:26 +09:30
3d572ccc27
Merge pull request #9874 from mwerezak/fixes
...
Dev-freeze Fixes
2015-06-21 09:04:08 +02:00
9426d0844c
Merge pull request #9872 from mwerezak/earslot
...
Fixes #9514
2015-06-21 09:03:00 +02:00
80c80abe3a
Fixes #9511
2015-06-21 03:00:37 -04:00
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
a4fb9fbb51
Patting out flames is no longer extremely effective
2015-06-21 00:44:14 -04:00
6a8aeb0153
Makes fire extinguishers effective at putting out mob fires
...
Doubles the amount of water extinguishers carry and quadruples the
amount of water sprayed with each use. Halves the damage taken by slimes
when exposed to water to compensate.
Also refactors chair propelling a bit.
2015-06-21 00:43:15 -04:00
7473d18ecb
Merge pull request #9795 from hockeygoalie5/iaasuit
...
Internal Affairs Hardsuit (and a new pen!)
2015-06-21 13:24:13 +09:30
405131a54e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/guns/projectile/pistol.dm
code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00
ac032f70fc
Changes the module from a watch to the horrible tie. Renames module to augmented tie. Moves module to the ERT ready room.
2015-06-20 14:26:37 -04:00
4a5da7221c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/resist.dm
2015-06-20 20:24:05 +02:00
bb370a66f3
Merge remote-tracking branch 'upstream/dev' into iaasuit
2015-06-20 14:07:44 -04:00
33dc2e5811
Merge pull request #9867 from Zuhayr/dev-freeze
...
More fixes
2015-06-20 19:05:32 +02:00
82aa88c777
Merge pull request #9862 from Zuhayr/dev
...
Fixes
2015-06-20 17:27:26 +01:00
6fff0069db
Fixes # #8327
2015-06-21 01:48:15 +09:30
7c1696c3c8
Fixes #9435
2015-06-21 01:27:23 +09:30
6f00d831e5
Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
...
Base proc: emag_act
2015-06-21 01:18:25 +09:30
f371da4ae9
Merge pull request #9838 from mwerezak/stunrevolver
...
Assorted small dev-freeze tweaks, stunrevolver fix
2015-06-21 01:16:58 +09:30
7d9378748d
Comments out fire and rads for material objects since they are very imbalanced atm.
2015-06-20 22:48:08 +09:30
56b68b9abe
Fixes #9847
2015-06-20 22:15:38 +09:30
e13c4a2243
Fixes #7828
2015-06-20 21:57:03 +09:30
7d710f2019
Fixes #8471
2015-06-20 21:54:22 +09:30
1e56cc0914
Fixes #9836
2015-06-20 21:43:54 +09:30
062f06ecb9
Fixes #9835
2015-06-20 21:00:02 +09:30
45e0f1b233
Merge pull request #9859 from mwerezak/bucklefix
...
Fixes #9624
2015-06-20 01:00:48 +03:00
22d0f6ab83
Compilation fixes.
2015-06-19 10:25:43 +02:00
1558bd5b75
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/toys.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defense.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers.dm
html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
f5da9f70c5
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
config/example/config.txt
2015-06-19 09:55:48 +02:00
ccb12556d6
Fixes #9624
2015-06-18 16:31:29 -04:00
eea423ce0f
Merge pull request #9857 from GinjaNinja32/bot
...
Adds support for bots which use world.Export() for server-to-bot communication
2015-06-18 13:46:50 -04:00
7ee7cafbff
Merge pull request #9846 from GinjaNinja32/irc
...
Allows setting the URL for the IRC bot to report separately from the main SERVER config setting
2015-06-18 13:46:32 -04:00
8d232e9304
Adds support for bots which use world.Export() for server-to-bot communication
2015-06-18 18:34:55 +01:00
44644d34b4
Restores stop drop and roll time
...
Returns the duration of stop drop and roll to 3 seconds. The amount of
removed fire stacks was reduced by ~3/5 instead of lengthening the time.
2015-06-18 12:55:31 -04:00
5c1499ff1f
Merge remote-tracking branch 'upstream/dev-freeze' into stunrevolver
2015-06-18 12:54:43 -04:00
4b441bc293
Adjusts animate_tail_once duration
2015-06-18 12:53:20 -04:00
5a026b1553
Overhauls berets, adds corporate black
2015-06-18 18:10:35 +02:00
341b29c34a
Merge remote-tracking branch 'upstream/dev' into 150614-MakingYourLifeEvenEasierApplyDirectlyToForehead
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-17 16:10:26 +02:00
6ed7cee041
mob/living/Life() now handles even more regular hud updates. Relocates action handling.
2015-06-17 16:09:13 +02:00
9d38bcc149
mob/living/Life() now handles regular status updates.
2015-06-17 16:01:26 +02:00
b26edd690c
Certain sidearms now use the lighter gunshot sound
2015-06-17 09:59:40 -04:00
1ba777f670
Reverses stunrevolver buff
2015-06-17 09:59:39 -04:00
d4b2fb7176
mob/living/Life() now handles regular hud updates.
2015-06-17 15:47:24 +02:00
b98d64b668
mob/living/Life() now handles processing grabs.
2015-06-17 15:41:25 +02:00
225ed82c1c
mob/living/Life() now handles can move.
2015-06-17 15:38:53 +02:00
838739c4ed
mob/living/Life() now handles updating pulling.
2015-06-17 15:35:41 +02:00
9887f16135
mob/living/Life() now has basic gravity handling (no overrides).
2015-06-17 15:32:23 +02:00
c8b7a77399
mob/living/Life() now handles stomach contents.
2015-06-17 15:19:41 +02:00
078cfb2533
Merge pull request #9774 from mwerezak/chem-touch
...
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
GinjaNinja32