309dff6aba
One less object verb
2015-06-27 23:54:20 -04:00
c7ff5eebe3
Updates hats to use item_state_slots where necessary.
2015-06-27 23:33:33 -04:00
f096d5cabe
Merge resolution.
2015-06-28 06:13:24 +09:30
411987c68b
Merge resolution with master.
2015-06-28 06:02:52 +09:30
3c3d6f3497
Un-breaks hats, semi-fixes #9873 , partially reverts #9937
2015-06-27 08:59:27 +01:00
a3dde19498
Makes suit species_restricted handled by whitelist instead of blacklist
2015-06-27 00:51:11 -04:00
0bc7ce1119
Makes breacher rigs fit unathi only
2015-06-27 00:44:03 -04:00
e5d8b15d01
Compilation fixes.
2015-06-26 20:33:55 +02:00
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
98572db1a0
Merge pull request #9940 from atlantiscze/connection_estabilished
...
Fixes #9929
2015-06-26 19:24:24 +01:00
d1cc0517ce
Sound environment changes. Different values for hallways, carpeted rooms, maintenance tunnels, etc. Holodeck sound environment changes with the loaded program
...
In low-pressure or space, sounds will be heard in sound environment 22 (underwater))
2015-06-27 03:47:37 +10:00
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
90f08d3fa7
Fixes #9929
...
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
2015-06-26 18:22:59 +02:00
8fef02501c
Merge pull request #9936 from mwerezak/fire
...
Balances fire to work better with very low concentration phoron gas burning
2015-06-26 13:34:21 +02:00
ed779b7ff9
Merge pull request #9937 from mwerezak/master-fixes
...
Fixes
2015-06-26 09:19:48 +03:00
c6c200c127
Fixes #9251
2015-06-26 01:38:04 -04:00
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
aae29d8b6e
Adds 'melting' and ignition points for various materials
2015-06-26 00:41:19 -04:00
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
9d7a1b9ad6
Fixes misleading path and proc name
2015-06-26 00:40:31 -04:00
ceb1832505
Tries to please Travis.
2015-06-25 20:22:52 -04:00
fcde61acdd
Fixes the sloppy merge conflict resolution.
2015-06-25 19:14:15 -04:00
462eaa834b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync
...
Conflicts:
.travis.yml
code/modules/clothing/spacesuits/rig/modules/combat.dm
code/modules/clothing/spacesuits/rig/modules/utility.dm
code/modules/mob/living/silicon/ai/ai.dm
icons/mob/rig_back.dmi
polaris.dme
2015-06-25 18:50:18 -04:00
5906ae7556
Adds 'age' command to world.Topic, for the IRC bot. Also runs all keys through ckey() before using them, to avoid easily-fixed errors
2015-06-25 22:52:36 +01:00
78784a3d9a
Fixes #9933
...
Also potential same issue with other scalpel subtypes.
2015-06-25 23:59:12 +03:00
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
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
mwerezak