9d03286b6c
Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon.
2015-06-25 23:04:33 +03:00
e6b4cecf50
Fixes #9519
...
Now client can't escape the resetting!
2015-06-25 21:09:51 +03:00
27a7768ffc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-06-25 17:58:37 +09:30
bca222b119
Some more disability cleanup.
2015-06-25 08:39:33 +02:00
d722dfa420
Merge pull request #9911 from mwerezak/disposal
...
Disposals fixes
2015-06-25 06:14:00 +01:00
51eecd54f0
Fixes disposal bins filling instantly
...
Fixes disposal bins filling instantly, side effect of fixing
air_contents having the wrong volume
2015-06-24 22:09:47 -04:00
1cb41db995
Adds lighting for air alarms and fire alarms
2015-06-24 22:01:21 -04:00
cb0b3a30da
Fixes runtime
...
Fixes the other runtime in #9310
2015-06-24 00:13:41 -04:00
a147a4e15e
Removes fat mutation checks
2015-06-23 23:36:19 -04:00
285ce84044
Fixes disposals not transferring gas to holder, creating air_contents with the wrong volume, runtime due to terrible management of shared gas_mix
...
Fixes one of the runtimes in #9310
2015-06-23 23:32:27 -04:00
1fc147088d
Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item
2015-06-23 17:28:23 +01:00
c48ffa8d63
Lighting optimizations + meson fix
2015-06-23 17:46:11 +02:00
130ff67414
Merge pull request #9902 from Baystation12/dev-freeze
...
Dev freeze
2015-06-23 20:53:38 +09:30
8bb0f7496e
Merge pull request #9900 from mwerezak/extinguisher
...
Changelog, fire patting
2015-06-23 06:46:34 +03:00
4961efec0f
Adjusts patting to account for shorter timeout
2015-06-22 22:17:30 -04:00
9698def0e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/nano/modules/human_appearance.dm
2015-06-22 16:59:19 +02:00
9c32851ba5
Merge pull request #9871 from mwerezak/extinguisher
...
Fire Extinguishers
2015-06-22 15:36:55 +01:00
aa2e25928d
Fixes a runtime with organ Destroy() called with nonhuman owner.
2015-06-22 22:03:24 +09:30
60f6a2ea10
Fixes antags being able to see the appearance changer.
...
Sets invisibility level to MAXIMUM.
2015-06-21 21:12:28 +02:00
4b5899fa30
Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct
...
Corrects two ex_acts.
2015-06-21 13:16:23 +01:00
e3cf4692b5
Merge pull request #9879 from PsiOmegaDelta/150621-BoldChanges
...
Fixes the Changelog menu button.
2015-06-21 13:16:18 +01:00
1a6ea56194
Fixes the Changelog menu button.
...
It had lost the ability to go bold upon detected unread changelog entries.
2015-06-21 13:39:26 +02:00
8100f286a6
Corrects two ex_acts.
...
Decreases immovable rod severity to match other ex_acts in file.
Increases meteor gun ex_act severity.
2015-06-21 13:26:48 +02:00
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
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
Chinsky