mwerezak
7af63ede5a
Custom items default to the inhands of the parent
...
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
2015-07-04 10:40:44 -04:00
mwerezak
b7ee6e11fc
Swaps force divisors between kitchen knives and utensil knives.
...
Because why does the utensil deal more damage than a chopping knife?
2015-07-03 22:02:28 -04:00
mwerezak
b2d3711c11
Fixes knife inhand states
2015-07-03 21:58:11 -04:00
PsiOmegaDelta
0624fced64
Compilation.. fix and ensuring the Thunderdome isn't a dark pit.
2015-06-30 08:46:32 +02:00
PsiOmegaDelta
cf10dc38b1
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/game/atoms.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/silicon/silicon.dm
2015-06-30 08:24:43 +02:00
GinjaNinja32
ebf037af5e
Fixes an infinite loop issue
...
Title. reset_view() called handle_regular_hud_updates() called check_eye() called reset_view() [...]
2015-06-30 06:26:51 +01:00
Chinsky
3a391250a2
Merge pull request #9961 from PsiOmegaDelta/150628-DroneRuntime
...
Fixes drone runtime.
2015-06-29 22:48:37 +03:00
PsiOmega
7e33beab0f
Fixes drone runtime.
...
Spawning drones no longer cause runtimes. Fixes #9909 .
2015-06-28 19:02:23 +02:00
Chinsky
9cfd04f959
Merge pull request #9952 from mwerezak/camera-console-fix
...
Fixes #7910
2015-06-28 19:42:00 +03:00
PsiOmega
85d0d6fcd3
Wrenching times no longer runtime.
...
Fixes #9175 .
2015-06-28 18:17:53 +02:00
mwerezak
4062f81f20
Fixes #7910
...
Partial port from vgstation.
Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb. check_eye() now returns the vision
flags to be set on the viewer. Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
2015-06-28 11:59:19 -04:00
PsiOmegaDelta
b482c5c07d
Merge pull request #9958 from GinjaNinja32/botfix
...
(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly
2015-06-28 12:48:54 +02:00
GinjaNinja32
9a9f8e5563
(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly
2015-06-28 11:43:53 +01:00
PsiOmegaDelta
6a808e5394
Merge pull request #9956 from GinjaNinja32/time
...
Changes time to never go higher than 23:59
2015-06-28 09:17:14 +02:00
GinjaNinja32
9d57473eff
changes time to never go higher than 23:59
2015-06-28 01:34:57 +01:00
Zuhayr
411987c68b
Merge resolution with master.
2015-06-28 06:02:52 +09:30
GinjaNinja32
3c3d6f3497
Un-breaks hats, semi-fixes #9873 , partially reverts #9937
2015-06-27 08:59:27 +01:00
Chinsky
be24aa0272
Merge pull request #9935 from GinjaNinja32/irc_notification
...
Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end
2015-06-27 01:09:37 +03:00
GinjaNinja32
61cd53e265
Merge pull request #9944 from Ravensdale/master
...
Remove posi-mmi-mechs
2015-06-26 21:31:02 +01:00
Ravensdale
ba3d180db6
Remove posi-mmi-mechs
...
fix
actual removal
2015-06-26 12:37:37 -07:00
GinjaNinja32
98572db1a0
Merge pull request #9940 from atlantiscze/connection_estabilished
...
Fixes #9929
2015-06-26 19:24:24 +01:00
PsiOmega
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
Atlantis
90f08d3fa7
Fixes #9929
...
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
2015-06-26 18:22:59 +02:00
PsiOmegaDelta
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
Chinsky
ed779b7ff9
Merge pull request #9937 from mwerezak/master-fixes
...
Fixes
2015-06-26 09:19:48 +03:00
mwerezak
c6c200c127
Fixes #9251
2015-06-26 01:38:04 -04:00
mwerezak
242f5c5dfd
Fixes #9928
2015-06-26 01:35:35 -04:00
mwerezak
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
mwerezak
aae29d8b6e
Adds 'melting' and ignition points for various materials
2015-06-26 00:41:19 -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
mwerezak
e08dbc3080
Adjusts gas fires to burn out faster with low concentrations of gas fuel
2015-06-26 00:40:06 -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
GinjaNinja32
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
Chinsky
78784a3d9a
Fixes #9933
...
Also potential same issue with other scalpel subtypes.
2015-06-25 23:59:12 +03: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
Chinsky
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
Chinsky
5dda5021a3
Fixed a list being qdel'd when radio is deleted.
2015-06-25 23:04:04 +03:00
Chinsky
e6b4cecf50
Fixes #9519
...
Now client can't escape the resetting!
2015-06-25 21:09:51 +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
GinjaNinja32
d722dfa420
Merge pull request #9911 from mwerezak/disposal
...
Disposals fixes
2015-06-25 06:14:00 +01:00
mwerezak
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
PsiOmega
8a9f5b9365
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-24 17:30:18 +02:00
Zuhayr
c688678444
Merge pull request #9912 from mwerezak/grillehit
...
Fixes #9910
2015-06-24 17:28:04 +09:30
mwerezak
aa0b23e205
Fixes #9910
2015-06-24 00:20:11 -04:00
mwerezak
cb0b3a30da
Fixes runtime
...
Fixes the other runtime in #9310
2015-06-24 00:13:41 -04:00
mwerezak
a147a4e15e
Removes fat mutation checks
2015-06-23 23:36:19 -04:00
mwerezak
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
PsiOmega
3b935ce854
Fixes #9813 .
...
Cutting fire alarm wiring now produces cables.
2015-06-23 18:15:30 +02:00
Chinsky
8bb0f7496e
Merge pull request #9900 from mwerezak/extinguisher
...
Changelog, fire patting
2015-06-23 06:46:34 +03:00
