Mloc
fe4490a295
fixes #10316
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-26 20:53:13 +01:00
PsiOmegaDelta
9b0497e01e
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-24 10:46:32 +02:00
Kelenius
7efaab0ab4
Fixes #9540 - borg message when using DA on storage
...
Radically. Frankly, this message is useless.
2015-07-23 10:10:10 +03:00
Kelenius
d509bdbbfe
Uses capitalize()
2015-07-21 11:58:39 +03:00
Kelenius
6b2daae752
Fixes #6264 - labeling janicart messes its ui
...
Janicart now uses nanoui and is immune to labeling screwing up its
interface
I've even resisted making pointless spacing changes this time!
2015-07-20 16:27:58 +03:00
Kelenius
7e8622b76a
Fixes #8210
...
Medicine stacks will now give one message per item category.
For example:
You clean and seal an ugly ripped cut and a ripped cut on Kelenius's
right arm.
You clean and seal an ugly ripped cut and a cut on Kelenius's left arm.
You clean and seal a cut, a cut, and a cut on Kelenius's left arm.
Code cleanup, spanclasses, spacing, stuff.
2015-07-17 09:24:13 +03:00
PsiOmegaDelta
8da7141af1
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-07-14 08:11:11 +02:00
Zuhayr
7dada28d8d
Fixes #10146
2015-07-14 05:18:57 +09:30
HarpyEagle
e0f89532e0
Fixes #10078
2015-07-13 11:08:58 -04:00
Ccomp5950
9990fb05be
Merge pull request #10167 from PsiOmegaDelta/150713-MorgueTrays
...
Fixes #10143 .
2015-07-13 09:40:20 -04:00
Ccomp5950
889019b445
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
...
Fixes
2015-07-13 09:35:58 -04:00
PsiOmega
e11ffcdfc9
Fixes #10143 .
...
Morgue/crematorium trays should now garbage collect properly.
2015-07-13 15:06:02 +02:00
Kelenius
e8bc544a92
Fixes #10150
2015-07-13 11:44:47 +03:00
PsiOmega
64cda4aa5a
Destroyed items now use drop_from_inventory instead of unEquip. Reduces the risk of references being kept in case of held items.
2015-07-13 10:20:46 +02:00
PsiOmega
9ba21f3079
Tried to resolve ID cards not GCing properly. Sorted some awful : uses instead.
2015-07-13 10:18:08 +02:00
mwerezak
0fc12eb22b
Fixes #9927
...
Fixes issues with deca code crates.
2015-07-13 00:45:36 -04:00
GinjaNinja32
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01:00
Zuhayr
c59dc2445c
Fixes #10062 and #10061
2015-07-12 07:04:35 +09:30
GinjaNinja32
c24f8f3452
Merge pull request #10088 from mwerezak/inhand-overlays2
...
Ports grenade and flash in-hand sprites
2015-07-10 21:12:11 +01:00
mwerezak
fb1eeae640
Adds inhand sprites for grenades
...
Adds inhand sprites for generic grenades, flashbang, and emp grenade.
Conflicts:
code/game/objects/items/weapons/grenades/emgrenade.dm
2015-07-10 11:00:29 -04:00
PsiOmegaDelta
265802d270
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/_DynamicAreaLighting_TG.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/explosion.dm
2015-07-10 12:57:46 +02:00
mwerezak
a36844cf84
Adds inhand sprites for the flash
2015-07-10 00:27:33 -04:00
Zuhayr
fae8a6964e
Merge pull request #10082 from mwerezak/inhand-icon-update
...
Fixes #9976
2015-07-10 13:02:16 +09:30
Zuhayr
eee306aedd
Merge pull request #10083 from mwerezak/capgun-icon
...
Fixes #9984
2015-07-10 13:02:10 +09:30
mwerezak
6fb6237816
Fixes #9984
...
Fixes capgun and dart crossbow inhands.
2015-07-09 23:00:22 -04:00
mwerezak
bb0dea8991
Fixes #9976
...
Deleted items update their loc's inhand overlays if they are in a mob
when GC'd.
2015-07-09 22:55:51 -04:00
HarpyEagle
cf88e87434
Fixes mounted RCD balance issues
2015-07-09 16:54:01 -04:00
Mloc
278a4c38ec
get rid of mob.see_in_dark and species.darksight
...
They don't work with the current lighting system and cause weird artifacts.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-09 19:17:04 +01:00
Chinsky
c7d9ce4697
Merge pull request #10046 from mwerezak/custom-item-icons
...
Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-09 20:52:38 +03:00
GinjaNinja32
f3d09e092e
Removes the approximations cheap_pythag and cheap_hypotenuse, since they're anything *but* cheap
2015-07-09 16:25:47 +01:00
Zuhayr
d47c2c8a02
Fixes #10013
2015-07-09 04:05:40 +09:30
mwerezak
01104eda45
Fixes utensil force dividers.
...
Fixes utensil knives deal more damage than a chopping knife, and spoons being a potentially deadly weapon.
2015-07-08 01:37:07 -04:00
PsiOmegaDelta
ed5a12c2a2
Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes"
2015-07-07 17:14:42 +02:00
PsiOmegaDelta
62017e7af2
Merge pull request #10008 from mwerezak/custom-item-icons
...
[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-07 06:44:10 +02:00
PsiOmega
cdb4270f48
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-06 17:31:41 +02: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
Kearel
9a6391747d
fix trays
...
Puts pikcup proc before loc is changed.
2015-07-02 13:55:27 -05: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
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
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
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
aa0b23e205
Fixes #9910
2015-06-24 00:20:11 -04:00
GinjaNinja32
9c32851ba5
Merge pull request #9871 from mwerezak/extinguisher
...
Fire Extinguishers
2015-06-22 15:36:55 +01:00
Zuhayr
e18966cbf6
Fixes #9887
2015-06-22 22:03:40 +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
712dc39185
Fixes #9729
2015-06-21 03:00:34 -04:00
mwerezak
2f1a6eaf83
Adjusts w_class of beach ball and scroll
2015-06-21 01:46:10 -04:00
