PsiOmega
e4f6436a85
Fixes #10494 .
...
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
Chinsky
7b1656f40c
Merge pull request #10470 from Karolis2011/dev-freeze
...
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
SomeoneElse
8c0984d5b1
Fix gender issues, some typos from various files
2015-08-11 13:41:40 +03:00
Kelenius
1324e69a19
Fixes #10466 - chem implant can't be loaded
...
What the literal shit.
2015-08-11 10:26:22 +03:00
PsiOmegaDelta
c560bd8d79
Merge pull request #10404 from mwerezak/stack-fix
...
Material stack related fixes
2015-08-08 09:56:25 +02:00
HarpyEagle
fc7e89380e
More material renames
...
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
2015-08-07 17:10:35 -04:00
PsiOmegaDelta
6b01a67c50
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
GinjaNinja32
595b58197d
fix pAI radios not working
2015-08-05 00:49:28 +01:00
PsiOmegaDelta
998b72bcd8
Fixes #10372 .
...
Removes snowflake attack code.
2015-08-03 09:20:36 +02:00
mwerezak
0ceb0e291d
Fixes #10314
...
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
mwerezak
e3609bac94
Adds common proc to obtain the material of an object
...
Adds a common get_material() proc to objects, and implements overrides
where applicable
2015-08-01 23:03:21 -04:00
Zuhayr
2a51b778d6
Fixes #9611
2015-08-01 21:10:48 +09:30
Zuhayr
ad63247749
Merge pull request #10382 from Mloc/freezyfixes
...
fixes
2015-07-31 03:55:34 +09:30
Atlantis
3bb88b327c
Fixes #10353
...
- Fixes icons not updating properly
- Also fixes a runtime.
2015-07-29 23:16:27 +02:00
mwerezak
6df770cab3
Fixes projectiles being able to hit humans in organs they do not have.
...
Will also prevent body shields blocking bullets with non-existant limbs. Expands on the special return values for bullet_act(), adds defines for them.
2015-07-28 20:23:26 -04:00
Zuhayr
64ccd8a048
Merge pull request #10269 from Mloc/lightwrite
...
lighting work
2015-07-27 11:41:14 +09:30
Mloc
fe4490a295
fixes #10316
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-26 20:53:13 +01: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
Mloc
65ac3d97d0
Revert "get rid of mob.see_in_dark and species.darksight"
...
This reverts commit 278a4c38ec .
2015-07-22 15:14:40 +01: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
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
889019b445
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
...
Fixes
2015-07-13 09:35:58 -04:00
PsiOmega
9ba21f3079
Tried to resolve ID cards not GCing properly. Sorted some awful : uses instead.
2015-07-13 10:18:08 +02:00
GinjaNinja32
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01:00
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
mwerezak
6fb6237816
Fixes #9984
...
Fixes capgun and dart crossbow inhands.
2015-07-09 23:00:22 -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
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
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
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
GinjaNinja32
9c32851ba5
Merge pull request #9871 from mwerezak/extinguisher
...
Fire Extinguishers
2015-06-22 15:36:55 +01:00
PsiOmegaDelta
3d572ccc27
Merge pull request #9874 from mwerezak/fixes
...
Dev-freeze Fixes
2015-06-21 09:04:08 +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
mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -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
Zuhayr
89d6e529a7
Compile fix.
2015-06-20 23:14:09 +09:30