Commit Graph

740 Commits

Author SHA1 Message Date
skull132
36dbadc106 Del() -> Qdel() 2016-02-07 14:59:21 +02:00
skull132
b8d5c57d79 Merge pull request #35 from skull132/master
Changelogs & Quick Tweaks
2016-02-01 19:06:36 +02:00
skull132
69e355fe9f Sec Related Tweaks
* Tasers are projectiles once more.
* Handcuffs don't need level 2 grab to work.
2016-02-01 18:59:02 +02:00
skull132
fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
skull132
1c167ac363 Merge pull request #11 from skull132/rifles-import
Rifles import
2016-01-28 02:06:32 +02:00
Ryan784
92c1ab268c Lawgiver reinstated
Adds back in Lawgiver, the lawgiver lockbox and the ability to create
them in research.
2016-01-14 16:54:26 -05:00
SkyMarshal
d10118e3d0 Fixes #11346
Fixes #8123

Removes adminbus ability to call down the Icarus... because it's pretty broken.
2015-12-12 12:03:15 -07:00
mwerezak
d508893e3c Tweaks pointblank multipliers to play better with droplimb thresholds 2015-12-06 02:44:09 -05:00
mwerezak
29192fd8e8 Fixes #11466 2015-12-06 02:35:18 -05:00
HarpyEagle
40ab99b354 Rubber bullets and beanbags now check melee armour instead of bullet armour 2015-10-08 16:36:51 -04:00
skull132
c1c8ff6259 automatic.dm fix
Makes things look more uniform.
2015-09-21 20:55:01 +03:00
skull132
4751235555 Energy rifles
Creates the /obj/item/weapon/gun/energy/rifle parent, which has a select-fire rifle, two types of laser rifles and a pulse rifle.
Also makes the energy sniper mimick the functionality of the AM rifle.

To do: test and modify the values for rifles, so they are different from their non-rifle counsins.
2015-09-21 20:54:25 +03:00
skull132
507869d848 Sorts out two-handed ballistic weapons in their entirety:
* All automatic rifles need two hands for improved performance
* Shotguns need 2 hands to be racked
* AM rifle needs two hands to look down scope, and for improved accuracy
2015-09-20 22:34:53 +03:00
skull132
c70d8d31fe Base code for handling any two-handed firearm. 2015-09-20 22:32:47 +03:00
Zuhayr
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
PsiOmega
78ffb5835a Misc. 2015-08-11 17:33:03 +02:00
PsiOmegaDelta
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
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
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
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
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
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
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
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
PsiOmegaDelta
2e920bce69 Merge pull request #9711 from mwerezak/syringelog
Syringe gun logs, logging helper reorganization
2015-06-07 09:00:21 +02: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
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
mwerezak
defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
mwerezak
53855d2398 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge 2015-05-18 18:47:45 -04:00
Zuhayr
2714e458b3 Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-17 12:58:09 +09:30
PsiOmega
8b39f9201a Compilation fixes. 2015-05-16 22:41:13 +02:00
PsiOmega
83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Chinsky
2359245f06 Merge pull request #9285 from mwerezak/master-fixes
Pneumatic cannon fix
2015-05-16 14:19:22 +03:00