Commit Graph

10021 Commits

Author SHA1 Message Date
mwerezak
630369b9dd More flash shell tweaks, autolathe recipes
Tweaks the flash shell some more.
Tweaks shotgun stun shells, adds spent icon.
Additional autolathe ammo recipes.
2015-02-11 22:48:21 -05:00
mwerezak
9e3667540c Fixes merge errors 2015-02-11 20:56:46 -05:00
mwerezak
5740f52964 Merge branch 'guns' into gun-rewrite
Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
2015-02-11 18:08:43 -05:00
mwerezak
611a42bb33 Gun cleanup and rewrite
Rewrites gun.dm. Reorganizes the firing procedure into logical procs and cleans up some unnecessary variables or demotes them to the subtypes that actually care. Energy weapons that create their own projectiles no longer care about in_chamber. Launcher support is much more natural now.

Cleans up duplicated cyborg energy weapon power supply code. Adds support for energy weapons to recharge from external power sources, unifying cyborg and hardsuit mounted weapons. Incorporates the cyborg taser recharging mechanism. Cleans up laser tag gun duplication

Changes path strings to actual paths. Changes relative paths to absolute paths.

Renamed several targeting vars to make their purposes more clear.

Fixed targeting not handling firing correctly for certain subtypes.
2015-02-11 15:46:09 -05:00
mwerezak
ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
mwerezak
7ccd78baa7 Makes non-edge damage sources less likely to delimb
Notably, shotgun slugs are no longer capable of automatic decapitation
2015-02-10 20:26:59 -05:00
mwerezak
2e6a0f4ebb Adjusts some gun force values
Gave some of the heavier looking weapons the same force value as the
shotgun.
2015-02-10 20:26:33 -05:00
mwerezak
1b35d5d53d Adds option for projectile guns to cycle casings 2015-02-10 20:26:07 -05:00
mwerezak
bf24ac82b8 Removes IsHandgun() proc, adds slot flag 2015-02-10 20:25:41 -05:00
mwerezak
47a1639b6d Adds removing single casings, runtime fix 2015-02-10 19:54:54 -05:00
mwerezak
ee894d6b99 Flash projectile adjustment
Adjusts brightness, adds some effects, adds 9mm flash rounds and pistol
variant.
2015-02-10 19:54:30 -05:00
Chinsky
d1de94c70e Merge pull request #8082 from Kelenius/ofMachinesAndParts
Update for machine upgrades and some science
2015-02-10 23:24:19 +03:00
Chinsky
712b952985 Merge pull request #8089 from GinjaNinja32/pai
NanoUI pAI, more modular pAI software
2015-02-10 10:05:20 +03:00
Chinsky
4f1afb3747 Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping
[Ready for Merge] Custom Item Update/Addition
2015-02-10 09:23:47 +03:00
Chinsky
ec6278f028 Merge pull request #8097 from mwerezak/projectile-fix
Fixes errors introduced by merge
2015-02-10 09:23:09 +03:00
PsiOmegaDelta
79aacd9f30 Merge pull request #8081 from comma/maximumtrinkets
Accessories update.
2015-02-10 06:51:30 +01:00
PsiOmegaDelta
973bc1c0f3 Merge pull request #8071 from RKF45/newpaint
Generic Paint II: Fun with Paint
2015-02-10 06:48:32 +01:00
mwerezak
5ddbbc0371 Fixes ammo_magazine icon states being handled incorrectly. 2015-02-09 21:35:37 -05:00
mwerezak
fc6dfb5f1b Ammo magazine and casing update
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
2015-02-09 21:32:49 -05:00
MrSnapwalk
05f14ccd84 Updates /obj/item/clothing/under/fluff/parkereliza and adds /obj/item/clothing/suit/fluff/parkereliza to the code. 2015-02-09 19:34:43 -06:00
mwerezak
d8a8384c41 Fixes errors introduced by merge
Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).
2015-02-09 17:53:47 -05:00
Chinsky
1c4734c4e3 Merge pull request #8088 from Raptor1628/dev
Paramedic Job Fixed
2015-02-10 01:00:08 +03:00
GinjaNinja32
70094884ff Fixes, code cleanup, adds the messenger I forgot last night 2015-02-09 10:41:08 +00:00
GinjaNinja32
538ee11cb1 pAI rework 2015-02-09 01:58:54 +00:00
mwerezak
a679d22db8 Cleaner click parameter handling 2015-02-08 19:42:18 -05:00
mwerezak
9e62e08d2e Absolute paths 2015-02-08 19:39:41 -05:00
Raptor1628
76f4001cc1 Paramedic Job Fixed
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
2015-02-08 17:23:02 -05:00
Kelenius
e6dc9d36fd Update for machine upgrades and some science
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
SkyMarshal
a78ef81712 To make PsiOmegaDelta happy
I hate this format.  Bluh bluh huge bitch
2015-02-08 04:04:06 -07:00
SkyMarshal
c8d6214657 Fix indent thing for pointdefense 2015-02-08 04:03:19 -07:00
SkyMarshal
84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
SkyMarshal
dadea3c7fa Adds two admin weapons and refactors wall damage code.
The Icarus is now fireable in gun form.  The point defense mode fires several lasers one after the other so that it can penetrate.  The main gun mode fires a modified meteor.  Also added an "abstract weapon" which has the projectile type settable for admin shenanigans.
Walls now lack an armor variable, which is replaced with buffed health.  Normal walls take 4 shots with a normal laser or 5 emitter bursts to destroy.  Reinforced walls now take 20 normal laser shots or 28 emitter shots.
Added some proactive runtime protection to logging for projectile impacts.  Without a valid firer, the jump button is linked to the victim.
2015-02-08 04:01:35 -07:00
Chinsky
de3e81657d Added moar sanity. 2015-02-08 12:45:50 +03:00
Chinsky
30de86c081 Accessories update.
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
RKF45
13f09d95c8 Juice paints 2015-02-08 01:17:10 +01:00
RKF45
db6ff13f5f No painting ghosts!
Holograms can be coloured, though
2015-02-07 23:59:34 +01:00
Ccomp5950
8f2720b179 Merge pull request #8052 from mwerezak/boolit
New bullet types, projectile refactor
2015-02-07 14:07:22 -05:00
mwerezak
fac32d07e9 Merge remote-tracking branch 'upstream/dev' into boolit
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2015-02-07 00:57:04 -05:00
Ccomp5950
33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans
Update for the slimes
2015-02-07 00:20:13 -05:00
Ccomp5950
3ba295dadb Merge pull request #8073 from Loganbacca/projectilescleanup
Code cleanup
2015-02-07 00:17:24 -05:00
mwerezak
414ad6b6da Merge remote-tracking branch 'upstream/dev' into pacman
Conflicts:
	code/modules/power/port_gen.dm
2015-02-06 23:32:39 -05:00
mwerezak
0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00
mwerezak
5494b4d8c9 Supply packs, autolathe recipes, magazine and box definitions. 2015-02-06 20:16:35 -05:00
unknown
39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
RKF45
5fc1ae395d All cleaning removes paint
Paint works on mobs and objects
2015-02-07 01:41:08 +01:00
Loganbacca
7cc440aecc Absolute paths
- Cleaned up projectile.dm and beams.dm
2015-02-07 13:37:12 +13:00
RKF45
0ad5195af2 Cleaning up 2015-02-06 23:55:11 +01:00
GinjaNinja32
f0e92023f0 Fixes startup runtime
Fixes #8062
2015-02-06 08:54:28 +00:00
Chinsky
3ddd0b480f Merge pull request #8061 from Baystation12/master
master -> wiz
2015-02-06 10:41:12 +03:00
Chinsky
3df6d38d2d Merge pull request #8047 from Neerti/1_30_2015_new_shuttle
Expanded Escape/Transfer Shuttle
2015-02-06 02:32:04 +03:00