Commit Graph

10061 Commits

Author SHA1 Message Date
mwerezak
242f5c5dfd Fixes #9928 2015-06-26 01:35:35 -04:00
mwerezak
56065022a7 Updates fire_act() implementations to work better with lower temperature fires
In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.
2015-06-26 00:40:55 -04:00
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
GinjaNinja32
94ffb49bfb Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end 2015-06-26 01:04:03 +01:00
Chinsky
265b1d5b51 Fixes #9913
Also axes hidden var in lieu of using implants like other foreign objects. Now instead of one object, amount of stuff you can put in someone's organ is restricted by stuff's combined w_class.
2015-06-25 23:51:58 +03:00
PsiOmegaDelta
fdab654beb Grid check now respects critical APC status.
Fixes #9919.
On power failure critical APCs are left alone, however on power restoration critical APCs are still included.
2015-06-25 14:12:05 +02:00
PsiOmega
8a9f5b9365 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-24 17:30:18 +02:00
mwerezak
aa0b23e205 Fixes #9910 2015-06-24 00:20:11 -04:00
PsiOmega
3b935ce854 Fixes #9813.
Cutting fire alarm wiring now produces cables.
2015-06-23 18:15:30 +02:00
PJB3005
c48ffa8d63 Lighting optimizations + meson fix 2015-06-23 17:46:11 +02:00
PsiOmegaDelta
cc4f22ad43 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-22 16:41:50 +02:00
GinjaNinja32
9c32851ba5 Merge pull request #9871 from mwerezak/extinguisher
Fire Extinguishers
2015-06-22 15:36:55 +01:00
Zuhayr
27b56676de Minor formatting error. 2015-06-22 22:36:00 +09:30
Zuhayr
e18966cbf6 Fixes #9887 2015-06-22 22:03:40 +09:30
Zuhayr
15c123dc54 Fixes #9892 2015-06-22 21:57:07 +09:30
Vivalas
06ce7e8973 Update smartfridge.dm 2015-06-21 18:33:07 -05:00
Vivalas
0035a3a5b8 Fixes tracking implants 2015-06-21 14:17:49 -05:00
GinjaNinja32
7f319f528a Merge pull request #9875 from Zuhayr/dev-freeze
Antag system fixes
2015-06-21 12:07:50 +01:00
Zuhayr
7476160008 Fixes #9876 2015-06-21 20:08:13 +09:30
Zuhayr
41cb433517 Fixes #9393 2015-06-21 20:05:23 +09:30
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
3d572ccc27 Merge pull request #9874 from mwerezak/fixes
Dev-freeze Fixes
2015-06-21 09:04:08 +02:00
PsiOmegaDelta
9426d0844c Merge pull request #9872 from mwerezak/earslot
Fixes #9514
2015-06-21 09:03:00 +02:00
mwerezak
1678cc5b96 Removes CRASH() 2015-06-21 03:00:36 -04:00
mwerezak
712dc39185 Fixes #9729 2015-06-21 03:00:34 -04:00
mwerezak
4605d19b79 Fixes #9280 2015-06-21 03:00:33 -04:00
mwerezak
2f1a6eaf83 Adjusts w_class of beach ball and scroll 2015-06-21 01:46:10 -04:00
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
mwerezak
6e9d73e792 Fixes #9585
Allows objects with PASSTABLE to pass over beds and chairs. Moves
chempuff passflags up to the parent water effect.
2015-06-21 00:44:38 -04:00
mwerezak
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
PsiOmegaDelta
33dc2e5811 Merge pull request #9867 from Zuhayr/dev-freeze
More fixes
2015-06-20 19:05:32 +02:00
Zuhayr
f371da4ae9 Merge pull request #9838 from mwerezak/stunrevolver
Assorted small dev-freeze tweaks, stunrevolver fix
2015-06-21 01:16:58 +09:30
Zuhayr
12507e6872 Fixes #9866 2015-06-21 01:13:41 +09:30
Zuhayr
89d6e529a7 Compile fix. 2015-06-20 23:14:09 +09:30
Zuhayr
7d9378748d Comments out fire and rads for material objects since they are very imbalanced atm. 2015-06-20 22:48:08 +09:30
Zuhayr
56b68b9abe Fixes #9847 2015-06-20 22:15:38 +09:30
Zuhayr
c8c35acf3a Fixes #9785 2015-06-20 22:12:38 +09:30
HarpyEagle
9b29ae64d9 Allows walls with matching base icons to merge 2015-06-18 20:34:49 -04:00
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
Zuhayr
5c22ba85c0 Merge pull request #9839 from comma/dev-freeze
Fixes
2015-06-17 16:12:08 +09:30
Zuhayr
031c7db3e5 Merge pull request #9821 from mwerezak/tableshaveturned
Makes standard tables plastic, related changes
2015-06-17 14:35:22 +09:30
Chinsky
b2779d6302 Fixes #9538
One does not simply qdel a list. Should be fine since it doesn't hold any objects, just bunch of strings.
2015-06-17 06:57:38 +03:00
Chinsky
5754c4edf7 Fixes #9211
Instead of several minutes long spawn, blood is added to processing for drying out now. Processing proc itself is just compraing two vars so shouldn't be as bad.
This way it doesn't get referenced by unnamed proc and can be qdel'd properly.
2015-06-17 06:50:08 +03:00
Chinsky
cc4f4d7bb2 Fixes #9834 2015-06-17 03:22:27 +03:00
mwerezak
70433b4367 Makes showers wash away touching reagents
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
mwerezak
f0c096627c Matches can be used to light things in adjacent turfs when thrown 2015-06-16 16:25:59 -04:00
PsiOmegaDelta
37f59551fc Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/reagents/reagent_containers/glass.dm
2015-06-16 10:30:50 +02:00
PsiOmegaDelta
93c3d03801 Merge pull request #9817 from GinjaNinja32/records
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
GinjaNinja32
4da75dba68 Fixes some more unbalanced HTML 2015-06-15 10:48:30 +01:00