4396e5a5bc
Merge pull request #9891 from Zuhayr/dev
...
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-21 14:23:57 -04:00
56131e1053
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
...
Conflicts:
code/modules/clothing/clothing.dm
2015-08-22 03:17:16 +09:30
3c477dfa5e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
bb82f80885
Added get_bodytype() species proc as groundwork for subspecies.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
edf74e4721
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
bf313ae238
Merge pull request #9851 from mwerezak/armourpen
...
Adds armor penetration system
2015-08-22 02:22:17 +09:30
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
6404d02c38
Adds changelog and tweaks PTR penetration.
2015-08-15 02:19:23 -04:00
2e8f927085
More descriptive variable name
...
Renames armorpen to armor_penetration
2015-08-13 22:38:28 -04:00
0cf21df8b5
Adjusts projectile values
2015-08-13 22:37:47 -04:00
94f0ceffe1
Merge pull request #10200 from mwerezak/gun-desc
...
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
ac80136603
Merge pull request #10184 from mwerezak/projectile-cleanup
...
Projectile code cleanup
2015-08-13 07:26:58 +03:00
21f7c8234d
Merge pull request #10473 from mwerezak/firemode-cleanup
...
Streamlines gun fire modes
2015-08-13 07:22:28 +03:00
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
78ffb5835a
Misc.
2015-08-11 17:33:03 +02:00
3185005496
Fixes #10410 . Fixes #10411 .
...
Removes improper code, that would cause spell projectiles to be deleted pre-maturely as well as cast the spell effect all too often.
Also removes completely unused code.
2015-08-11 13:36:56 +02:00
8cbd14c1a5
Splits up projectile/launch()
2015-08-10 19:00:38 -04:00
53affb4e44
Projectile cleanup
...
Moves projectile trajectory related setup into setup_trajectory(), removes
redundant target var on test projectiles.
2015-08-10 18:56:41 -04:00
ad54aca3ab
Streamlines gun firemodes
...
Gun firemodes now work by setting vars on the parent gun item. Removes the
need to unpack a bunch of firemode values when shooting and the need for
certain guns to define special firemode types.
2015-08-10 14:38:08 -04:00
e875a7ce48
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer3/buildandrepair.dm
code/game/objects/items/devices/lightreplacer.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
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
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +02:00
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
d203362d38
Fixes #10258
...
Turrets now aim at the chest/groin unless the target has a neck grab on someone, otherwise they aim elsewhere.
Projectiles are now able to miss targets that are lying or buckled, except when the target is at point blank range and is the original target for the projectile.
2015-07-28 20:17:32 -04:00
697157a6bc
Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful.
2015-07-15 22:08:21 -04:00
c779482afc
Merge with dev.
2015-07-15 16:20:39 +09:30
03927918c6
Merge pull request #10187 from Baystation12/master
...
Master > dev-freeze
2015-07-15 16:10:13 +09:30
be34a7cfc7
Fixes projectiles ignoring their specified target zone
2015-07-14 14:20:53 -04:00
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
c04fc312e2
Moved trajectory check to during target assessment
2015-07-11 02:47:47 +12:00
ba7e3ae9e8
Cargo train vs projectiles
...
If a cargo train has a mob riding it, there is a chance the mob will be hit by the projectile instead.
2015-07-11 02:16:17 +12:00
6b10b648d2
Implements turret trajectory prediction
...
- Adds trajectory checking for turrets, so they don't burn holes through other objects (like walls and AI's) if they wouldn't hit them anyway.
2015-07-11 02:16:17 +12:00
ce77c61028
Projectile visual bug fixes
...
- Fixed visible beam projectile
- Fixed additional tracers overlaying impact effects
2015-07-11 00:06:44 +12:00
6a8b051b21
Merge pull request #10076 from comma/dev-freeze
...
Fixes #9680
2015-07-09 23:41:42 +02:00
d469b3f42d
Fixes #9680
2015-07-10 00:27:16 +03:00
f2e27a8c89
fixes #8391
2015-07-09 13:23:13 -07:00
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
f134ef55a1
Merge pull request #10012 from mwerezak/guntweak
...
Shooting and machine/structure penetration tweaks
2015-07-05 22:26:05 +02:00
508827580c
Formatting
2015-07-04 22:39:09 -04:00
fad0a712d8
Expands raider gear list
2015-07-04 15:39:31 -04:00
cf5e4a17d6
Adds raider gun type, fixes sawn shotgun inhands
...
Also adds type def to allow spawning sawn shotguns.
2015-07-04 15:39:05 -04:00
8d1e669588
Shooting while on help intent no longer auto switches to hostage mode
2015-07-04 10:47:56 -04:00
ef538f2a8c
Adjusts bullet penetration chance for default machines and structures
2015-07-04 10:46:38 -04:00
06000a6984
Adds setMoveCooldown()
2015-06-30 22:30:12 -04:00
32b95445e3
Gives changeNextMove() a better name, default define
2015-06-30 22:29:45 -04:00
087a978d56
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
4b5899fa30
Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct
...
Corrects two ex_acts.
2015-06-21 13:16:23 +01:00
8100f286a6
Corrects two ex_acts.
...
Decreases immovable rod severity to match other ex_acts in file.
Increases meteor gun ex_act severity.
2015-06-21 13:26:48 +02:00
mwerezak