Commit Graph

4708 Commits

Author SHA1 Message Date
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
Zuhayr
fae8a6964e Merge pull request #10082 from mwerezak/inhand-icon-update
Fixes #9976
2015-07-10 13:02:16 +09:30
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
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
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
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
mwerezak
6e9d73e792 Fixes #9585
Allows objects with PASSTABLE to pass over beds and chairs. Moves
chempuff passflags up to the parent water effect.
2015-06-21 00:44:38 -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
12507e6872 Fixes #9866 2015-06-21 01:13:41 +09:30
Zuhayr
89d6e529a7 Compile fix. 2015-06-20 23:14:09 +09:30
Zuhayr
7d9378748d Comments out fire and rads for material objects since they are very imbalanced atm. 2015-06-20 22:48:08 +09:30
Zuhayr
c8c35acf3a Fixes #9785 2015-06-20 22:12:38 +09:30
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
Zuhayr
5c22ba85c0 Merge pull request #9839 from comma/dev-freeze
Fixes
2015-06-17 16:12:08 +09:30
Zuhayr
031c7db3e5 Merge pull request #9821 from mwerezak/tableshaveturned
Makes standard tables plastic, related changes
2015-06-17 14:35:22 +09:30
Chinsky
5754c4edf7 Fixes #9211
Instead of several minutes long spawn, blood is added to processing for drying out now. Processing proc itself is just compraing two vars so shouldn't be as bad.
This way it doesn't get referenced by unnamed proc and can be qdel'd properly.
2015-06-17 06:50:08 +03:00
mwerezak
70433b4367 Makes showers wash away touching reagents
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
mwerezak
f0c096627c Matches can be used to light things in adjacent turfs when thrown 2015-06-16 16:25:59 -04:00
PsiOmegaDelta
37f59551fc Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/reagents/reagent_containers/glass.dm
2015-06-16 10:30:50 +02:00
PsiOmegaDelta
93c3d03801 Merge pull request #9817 from GinjaNinja32/records
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
GinjaNinja32
4da75dba68 Fixes some more unbalanced HTML 2015-06-15 10:48:30 +01:00
mwerezak
dec1461f6c Fixes chair preview icon 2015-06-14 14:55:04 -04:00
GinjaNinja32
3c525e907a 'Fixes' NanoUI locking up on medical/security records 2015-06-14 14:44:38 +01:00
Kelenius
86b080769c Fixes two log destroyers 2015-06-14 15:54:07 +03:00
GinjaNinja32
d31cf8f3d8 Merge pull request #9786 from LightningIron/dev-freeze
Welding tool bugfixes
2015-06-11 09:42:21 +01:00
unknown
c062f886c0 Attempting to weld closet with inactive welder no longer produces message claiming insufficient fuel. 2015-06-10 22:07:52 -05:00
unknown
fe2ce02f54 Fixes #9744. 2015-06-10 21:50:48 -05:00
Zuhayr
f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
PsiOmegaDelta
e7faa19ea3 Merge pull request #9779 from Baystation12/master
Dev-freeze.
2015-06-10 11:04:54 +02:00