6fb6237816
Fixes #9984
...
Fixes capgun and dart crossbow inhands.
2015-07-09 23:00:22 -04:00
cf88e87434
Fixes mounted RCD balance issues
2015-07-09 16:54:01 -04:00
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
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
df83203356
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
d47c2c8a02
Fixes #10013
2015-07-09 04:05:40 +09:30
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
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
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
b2d3711c11
Fixes knife inhand states
2015-07-03 21:58:11 -04:00
8c51676722
Uplink Items - Part III
...
Phase III of the antag uplink additions.
Currently contains proof-of-concept falsified announcements.
2015-07-03 16:02:02 +02:00
48ee872691
Refactors gas analyize.
2015-07-02 15:32:21 +02:00
f420dd9f01
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defines.dm
code/modules/mob/living/silicon/silicon.dm
code/setup.dm
2015-06-30 08:59:34 +02:00
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
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
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
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
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
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
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
5a8e075fb2
Update uplink_kits.dm
2015-06-21 16:21:51 -05:00
cdc3c1f0d5
Update uplink_kits.dm
2015-06-21 15:47:48 -05:00
4ae7cbce5d
Re-adds the new uplink item
2015-06-21 15:42:37 -05:00
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
3d572ccc27
Merge pull request #9874 from mwerezak/fixes
...
Dev-freeze Fixes
2015-06-21 09:04:08 +02:00
712dc39185
Fixes #9729
2015-06-21 03:00:34 -04:00
2f1a6eaf83
Adjusts w_class of beach ball and scroll
2015-06-21 01:46:10 -04:00
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
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
405131a54e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/guns/projectile/pistol.dm
code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00
8664ecaabe
Merge pull request #9837 from PsiOmegaDelta/150616-Uplink
...
Refactors antag uplink.
2015-06-21 01:22:56 +09:30
6f00d831e5
Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
...
Base proc: emag_act
2015-06-21 01:18:25 +09:30
89d6e529a7
Compile fix.
2015-06-20 23:14:09 +09:30
7d9378748d
Comments out fire and rads for material objects since they are very imbalanced atm.
2015-06-20 22:48:08 +09:30
c8c35acf3a
Fixes #9785
2015-06-20 22:12:38 +09:30
1558bd5b75
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/toys.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defense.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers.dm
html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
8669878709
Makes it possible to buy up all telecrystals in one go.
2015-06-18 13:10:49 +02:00
99ba26f1ee
It is no longer possible to define the amount of telecrystals per game mode.
2015-06-18 10:59:45 +02:00
5b4dfdda9c
Allows one to define list of random selection items.
...
Includes a default list with a couple of semi-randomly selected probabilities.
2015-06-17 15:04:06 +02:00
078cfb2533
Merge pull request #9774 from mwerezak/chem-touch
...
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
f0c096627c
Matches can be used to light things in adjacent turfs when thrown
2015-06-16 16:25:59 -04:00
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
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
3291e4264c
Merge pull request #9829 from comma/ghett_ophthalmology
...
Updated penlight
2015-06-16 09:14:14 +01:00
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
dacc6cbd7c
Thefication
2015-06-16 02:50:25 +03:00
97974cbb7a
Updated penlight.
...
Cleaned up code a bit (holy shit those long conditions), axed yet another monkey mode check.
Made penlights aware of organs.
Added few more conditions that could be diagnosed with it - brain damage, drugs use, eye damage (surprising huh)
2015-06-16 00:38:46 +03:00
93c3d03801
Merge pull request #9817 from GinjaNinja32/records
...
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
mwerezak