Ccomp5950
722e100195
Merge pull request #6109 from Kelenius/OfEyesAndLazers
...
Fixes wizard's mutate lazers not working
2014-08-22 05:05:33 -05:00
Ccomp5950
1a51e72c1a
Merge pull request #6103 from Walter0o/water_fix
...
should fix #6099
2014-08-22 05:04:18 -05:00
Ccomp5950
5a0abbaee4
Merge pull request #6098 from PsiOmegaDelta/Pref
...
Fixes #6038
2014-08-22 05:03:47 -05:00
Ccomp5950
d636136e61
Merge pull request #6092 from comma/master
...
Optimized pulse reagent checking a little.
2014-08-22 05:01:41 -05:00
Ccomp5950
7db352fcc6
Merge pull request #6075 from MrSnapwalk/ertv3
...
ERT update 3: electric boogaloo.
2014-08-22 05:01:02 -05:00
Kelenius
d8b35de058
Fixes wizard's mutate lazers not working
2014-08-22 10:16:00 +04:00
mwerezak
ababfc1d0c
Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
2014-08-22 01:24:34 -04:00
mwerezak
c8f2d040a1
Fix for rad suits not protecting against radiation
...
Rad suits were not providing complete protection from radiation. This is
probably not the best solution. Better solutions would be to either add
the HANDS and FEET coverage flags as done here in addition to updating
the sprite to reflect the additional coverage, or to add radiation proof
gloves and boots as part of the radiation suit set (potentially
problematic for taj and unathi engineers).
2014-08-22 01:15:17 -04:00
mwerezak
ec52bf830d
Fixes human armor value for full body effects not being weighted by body part
...
This was an issue because it meant that not having hand or feet
protection reduced the player's protection from full body effects much
more than it should have, and meant that not having your hands protected
was just as bad as not having your chest protected.
2014-08-22 01:12:07 -04:00
mwerezak
1477fe17ab
Fixes apply_effect() used without armour checks
2014-08-22 00:02:50 -04:00
mwerezak
170baf15c7
Improves rand_zone() and miss chance procs
2014-08-21 23:32:51 -04:00
Raptor1628
5a030ac82b
Brig Fixes Clean
...
Includes all the previous fixes, plus removes loyalty implants from HoS
locker
2014-08-21 20:58:00 -04:00
mwerezak
006c98bcdd
Merge remote-tracking branch 'upstream/dev-freeze' into power-net
2014-08-21 20:25:58 -04:00
mwerezak
5d97c9d6a2
Fixes fore solars control room area
...
Also changes solar area requires_power and always_unpowered to match
area/space
2014-08-21 20:11:23 -04:00
mwerezak
304d88a4d4
Adds simple load balancing
2014-08-21 19:27:12 -04:00
Walter0o
1d9d9f7650
should fix #6099
2014-08-22 00:52:19 +02:00
PsiOmega
6a44883afb
Fixes #6038 . Adds a missing '
2014-08-21 21:52:59 +02:00
Chinsky
8163ff7f80
Merge pull request #6087 from mwerezak/power-net
...
Fixes a couple of bugs in apc/process()
2014-08-21 21:53:12 +04:00
Chinsky
871456f131
Merge pull request #6084 from PsiOmegaDelta/MoreNounce
...
Announcement Refactoring
2014-08-21 21:53:03 +04:00
Chinsky
575ce7a6bd
Merge pull request #6093 from Walter0o/disposals_fix
...
fixes #5907
2014-08-21 21:49:21 +04:00
MrSnapwalk
195805636b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3
2014-08-21 11:40:35 -05:00
Walter0o
ff8047baa0
fixes #5907
...
issue caused by relaymove() not being checked properly.
added comment to prevent this kind of issue in the future.
2014-08-21 15:41:28 +02:00
Chinsky
f559a7eb85
Merge pull request #6079 from PsiOmegaDelta/PipeDrop
...
Allows clicking floors to drop pipes
2014-08-21 17:34:13 +04:00
PsiOmega
f9df93fad0
Expands the use of the new announcement system.
...
Code Green/Blue/Red/Delta, ERT, and captain annoncements now use the new announcement system.
These announcements are stored as newscasts.
2014-08-21 12:58:02 +02:00
Chinsky
e803c90aec
Optimized pulse reagent checking a little.
2014-08-21 13:40:59 +04:00
Ccomp5950
a80931a6b9
Merge pull request #6069 from comma/photo
...
Added ability to pick photo size.
2014-08-21 03:32:48 -05:00
Chinsky
77066d1f62
Merge pull request #6078 from PsiOmegaDelta/TurretExploit
...
Fixes turret exploit
2014-08-21 12:09:28 +04:00
Chinsky
ed496b8463
Merge pull request #6081 from Walter0o/magical_smes_dev
...
fixes #6046
2014-08-21 12:09:09 +04:00
mwerezak
f2b234fe81
Fixes APCs drawing more power than they can to use to charge
2014-08-21 01:18:26 -04:00
PsiOmega
68bf885e6b
Announcement system refactoring.
...
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast
Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.
Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
2014-08-21 06:34:41 +02:00
Zuhayr
ee499426ad
Compile fixes.
2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
mwerezak
10f95933dd
Fixes power draw not being processed if no power was available
...
Should address some of the issues raised in Pull Request #6080
2014-08-20 21:54:27 -04:00
Zuhayr
0397ce5f1a
Merge pull request #6076 from Jarcolr/patch-1
...
Fixes #5943
2014-08-21 11:19:30 +09:30
igalan
d4be0bfc87
Removed pure laziness comment line
2014-08-21 02:46:18 +01:00
MrSnapwalk
7a2ee219ab
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3
2014-08-20 19:43:29 -05:00
igalan
031d5070fc
Cleans up chem dispenser code by taking out the unused broken_on_spawn var. And frankly, if we wanted that feature, it would be done in other way.
2014-08-21 01:02:54 +01:00
Chinsky
fd486ea369
Merge pull request #6064 from PsiOmegaDelta/Announce
...
AI Announcements & Verbs
2014-08-21 01:37:55 +04:00
Chinsky
ec791bd81c
Merge pull request #6068 from faerindel/vending_exploit_fix
...
Fixes #6054
2014-08-21 01:36:21 +04:00
Walter0o
71d130e52b
fixes #6046
2014-08-20 13:18:13 +02:00
PsiOmega
67752bd40b
Allows clicking (simulated) floors to drop pipes
...
This makes it possible to install pipes under immovable objects, similar to power cables.
2014-08-20 12:21:42 +02:00
PsiOmega
30c581c8b3
Fixes an exploit reported at tgstation/-tg-station#4491 . Credits to @MrPerson for the fix.
2014-08-20 10:46:09 +02:00
Jarcolr
c481d035f5
Fixes #5943
...
Recharging should give rods.
2014-08-20 11:14:54 +03:00
MrSnapwalk
9b464d268c
ERT update 3: electric boogaloo.
2014-08-19 21:46:27 -05:00
Chinsky
6cc4280c48
Merge pull request #5990 from Hubblenaut/dev
...
Fixes phoron reactions
2014-08-20 00:19:34 +04:00
PsiOmega
a2253617cf
Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration.
2014-08-19 21:09:14 +02:00
Chinsky
472e9b764d
Added ability to pick photo size.
2014-08-19 21:19:23 +04:00
Ccomp5950
770fb4de4c
Merge pull request #6052 from PsiOmegaDelta/Mapping
...
Fixes #6027
2014-08-19 12:01:14 -05:00
igalan
322c5b53f2
Fixes #6054
2014-08-19 17:50:55 +01:00
Walter0o
eb7c2aa9c5
should fix #6065
2014-08-19 17:26:10 +02:00
