mwerezak
4092b40ae5
Updates frag grenades to use bresenham, tweaks
2015-08-15 02:41:32 -04:00
mwerezak
da58494275
Improves the way shrapnel clouds hit prone mobs
2015-08-14 00:25:41 -04:00
mwerezak
cb2a094553
Adds fragmentation grenades
...
Adds a fragmentation grenade item that launches a shower of projectiles
in all directions when detonated.
2015-08-11 02:42:25 -04:00
HarpyEagle
8cbd14c1a5
Splits up projectile/launch()
2015-08-10 19:00:38 -04:00
HarpyEagle
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
PsiOmega
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
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
PsiOmegaDelta
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +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
mwerezak
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
Zuhayr
c779482afc
Merge with dev.
2015-07-15 16:20:39 +09:30
Zuhayr
03927918c6
Merge pull request #10187 from Baystation12/master
...
Master > dev-freeze
2015-07-15 16:10:13 +09:30
HarpyEagle
be34a7cfc7
Fixes projectiles ignoring their specified target zone
2015-07-14 14:20:53 -04:00
PsiOmegaDelta
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
Loganbacca
c04fc312e2
Moved trajectory check to during target assessment
2015-07-11 02:47:47 +12:00
Loganbacca
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
Loganbacca
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
Loganbacca
ce77c61028
Projectile visual bug fixes
...
- Fixed visible beam projectile
- Fixed additional tracers overlaying impact effects
2015-07-11 00:06:44 +12:00
PsiOmegaDelta
6a8b051b21
Merge pull request #10076 from comma/dev-freeze
...
Fixes #9680
2015-07-09 23:41:42 +02:00
Chinsky
d469b3f42d
Fixes #9680
2015-07-10 00:27:16 +03:00
Null Snapshot
f2e27a8c89
fixes #8391
2015-07-09 13:23:13 -07:00
PsiOmega
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
PsiOmegaDelta
f134ef55a1
Merge pull request #10012 from mwerezak/guntweak
...
Shooting and machine/structure penetration tweaks
2015-07-05 22:26:05 +02:00
mwerezak
508827580c
Formatting
2015-07-04 22:39:09 -04:00
mwerezak
fad0a712d8
Expands raider gear list
2015-07-04 15:39:31 -04:00
mwerezak
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
mwerezak
8d1e669588
Shooting while on help intent no longer auto switches to hostage mode
2015-07-04 10:47:56 -04:00
mwerezak
ef538f2a8c
Adjusts bullet penetration chance for default machines and structures
2015-07-04 10:46:38 -04:00
GinjaNinja32
4b5899fa30
Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct
...
Corrects two ex_acts.
2015-06-21 13:16:23 +01:00
PsiOmegaDelta
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
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
PsiOmegaDelta
9426d0844c
Merge pull request #9872 from mwerezak/earslot
...
Fixes #9514
2015-06-21 09:03:00 +02:00
mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
PsiOmegaDelta
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
HarpyEagle
b26edd690c
Certain sidearms now use the lighter gunshot sound
2015-06-17 09:59:40 -04:00
HarpyEagle
1ba777f670
Reverses stunrevolver buff
2015-06-17 09:59:39 -04:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
PsiOmega
ee88e7b8b4
Base Life-addition()
2015-06-13 13:36:08 +02:00
Chinsky
94406a6430
Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
...
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03:00
PsiOmega
fc6de24042
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
2015-06-07 10:51:41 +02:00
PsiOmegaDelta
6eea4ae7da
Merge pull request #9712 from mwerezak/all-things-to-everyone
...
Chameleon items
2015-06-07 09:01:11 +02:00
PsiOmegaDelta
2e920bce69
Merge pull request #9711 from mwerezak/syringelog
...
Syringe gun logs, logging helper reorganization
2015-06-07 09:00:21 +02:00
mwerezak
3906989eac
Mostly removes creation of throwaway objects from chameleon items
...
- Replaces the creation of throwaway items from New() with initial() calls for all chameleon items.
- Unfortunately throwaway items could not be removed when switch appearance, as initial() does not work very will with list vars.
- Makes chameleon item name cache lists global.
- Makes chameleon guns a subtype of energy guns, removes chameleon magazines.
- Moves chameleon.dm to clothing module root
- Items without icon or icon_state are no longer selectable as chameleon appearances.
- Chameleon verbs go in their own panel.
2015-06-06 18:19:23 -04:00
mwerezak
f62cc38883
Adds logging for syringe_gun
...
Also updates holder get_reagents() output formatting
2015-06-06 17:02:42 -04:00
mwerezak
15d82778cd
Muzzle flash sets lighting instead of creating objs
...
Shooting a gun no longer generates illumination objects
2015-06-06 12:57:43 -04:00
PsiOmegaDelta
a07d20d657
Ports /tg/'s meteor implementation.
...
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
Yoshax
1711d01e7a
Makes special wizard projectile staffs only usable by wizards.
2015-06-04 19:42:06 +01:00
Kelenius
3bdb5ff9ea
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/leather.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/kitchen.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
2015-05-22 19:26:39 +03:00
PsiOmega
e74c0e65bf
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
Kelenius
35a20002c6
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
baystation12.dme
code/defines/obj/weapon.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_parts.dm
code/game/objects/items/devices/flash.dm
code/game/objects/items/devices/powersink.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
code/game/objects/items/weapons/circuitboards/machinery/power.dm
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
code/game/objects/items/weapons/circuitboards/machinery/research.dm
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/teleportation.dm
code/game/objects/items/weapons/tools.dm
code/modules/assembly/igniter.dm
code/modules/assembly/infrared.dm
code/modules/assembly/mousetrap.dm
code/modules/assembly/proximity.dm
code/modules/assembly/signaler.dm
code/modules/assembly/timer.dm
code/modules/assembly/voice.dm
code/modules/clothing/glasses/glasses.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/mining/drilling/scanner.dm
code/modules/mining/mine_items.dm
code/modules/mining/ore.dm
code/modules/mob/living/silicon/robot/analyzer.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
