Commit Graph

294 Commits

Author SHA1 Message Date
mwerezak
645910947b Adds orderable flaregun crate
Mainly to make double-barrelled shotguns orderable.
2015-03-09 16:00:49 -04:00
mwerezak
91d7dd7049 Adjusts item_state placeholders
Tries to switch the current placeholders for something less awkward
looking. As well, the WT550 will no longer be mistaken for a pistol.
2015-03-09 15:39:24 -04:00
mwerezak
5abf0248fc Firing the Z8 grenade launch automatically switches back to regular firing. 2015-03-09 03:14:26 -04:00
Chinsky
07ee8424da Merge pull request #8371 from mwerezak/gun-rewrite
Edits Z8 desc
2015-03-06 11:56:31 +03:00
mwerezak
875f805724 Edits Z8 desc 2015-03-06 00:06:53 -05:00
mwerezak
8d1a92a0f5 Hardsuit tweaks
Spider fang blade uses power faster.
Light hardsuits (minus ninja suit) have voidsuit-level breach thresholds.
If the suit is malfunctioning when it runs out of power then you will need someone to cut you out.
2015-02-28 14:04:53 -05:00
mwerezak
a026922115 More hardsuit fixes, ion rifle fix
Fixes modules being usable when destroyed.
Fixes charge display for fractional charge values.
Fixes ion rifles EMPing themselves.
2015-02-28 04:15:29 -05:00
mwerezak
7dd82f8763 Merge remote-tracking branch 'upstream/dev-freeze' into backup
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
2015-02-28 03:39:38 -05:00
mwerezak
55a3b94995 Hardsuit adjustments, fixes
Default inherited offline_slowdown set to 3, as most hardsuits use this
value. ERT no longer get rad immunity, they have enough advantages -
instead only ERT engineers get that.
ERT engineer gauntlets are also now insulated, allowing them to do
wiring work in space.
Fixed a compile error.
Fixed mounted laser cannons taking too long to recharge.
2015-02-28 03:36:00 -05:00
Zuhayr
f14922f1f8 Merge pull request #8288 from mwerezak/topicfix
Topic Fixes
2015-02-26 16:28:56 +10:30
mwerezak
ec59f8ab07 Fixes captain's laser gun
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
2015-02-25 23:35:20 -05:00
mwerezak
6d15809768 Corrects return values for the Topic procs of several computers and some other machines as well. 2015-02-25 21:32:35 -05:00
mwerezak
b067b491a4 Returns the laser carbine capacity to 10 2015-02-25 00:15:08 -05:00
mwerezak
ae6466ac45 Examining the Z8 now shows what is loaded in the grenade launcher. 2015-02-25 00:14:02 -05:00
mwerezak
3e71802a52 Replaces colt signal pistol with a Mk58 version.
Makes more sense for the HoP, and ensures the colt remains more of a
detective signature item.
2015-02-24 21:23:19 -05:00
mwerezak
401709cd23 Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite 2015-02-24 20:15:18 -05:00
mwerezak
3940c35184 Misc gun tweaks 2015-02-23 18:25:22 -05:00
mwerezak
e540550cff Adds an underslung grenade launcher to the Z8. 2015-02-23 17:56:54 -05:00
Chinsky
b5dda2b793 Merge pull request #8180 from mwerezak/mercenary
Map updates and fixes, plus hardsuit icons
2015-02-23 15:27:35 +03:00
mwerezak
dfec1fcb5c Improves energy gun charge icon handling, adds ion rifle in-hand sprite. 2015-02-22 21:46:18 -05:00
mwerezak
115bbbe669 Nerfs merc sniper rifle and makes it uplink purchasable
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
2015-02-22 20:27:06 -05:00
mwerezak
5bc076cc25 Adds a better placeholder item_state for the ion rifle 2015-02-21 14:25:06 -05:00
mwerezak
09afd35798 Syringe gun cartridges change name when loaded 2015-02-20 21:04:19 -05:00
mwerezak
2db45d592f Makes the Z8 wearable on the back, adjusts some desc text. 2015-02-18 18:44:23 -05:00
Raptor1628
2ae273e1b8 Gear again
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
mwerezak
c804d818fd Fixes rocket launcher icon
Also makes the missiles a little bit less of a joke.
2015-02-16 22:59:35 -05:00
mwerezak
9b3ab4358d Fixes empty casings not being ejected or cycled 2015-02-16 22:59:11 -05:00
mwerezak
2791a93bf2 SAW and c20r fixes
Fixes SAW unloading. Fixes c20r and SAW icon states. Tweaks sniper desc, and makes clip icons for 7.62mm ammo less pixelated - still pretty much a codersprite though. Fixes ptrs item_state.
2015-02-16 22:54:09 -05:00
mwerezak
7f19a8a77b Tweaks bullet penetration 2015-02-16 03:04:48 -05:00
mwerezak
500ca93278 Fixes guns being unremovable
Fixes certain guns being unremovable due to unloading ammo taking
precedence over picking up. Also adds on-back icon for the merc sniper
which is just a copy of the LWAP's.
2015-02-16 01:47:07 -05:00
mwerezak
c20986b140 Fixes quoted paths 2015-02-16 01:12:43 -05:00
mwerezak
83780ef550 Adds sts-35 automatic rifle 2015-02-16 01:12:16 -05:00
mwerezak
3c1ec28a37 Reorganizes colt pistols, moves renaming verb 2015-02-15 23:32:35 -05:00
mwerezak
2a4d1b08cd Fixes beakers splashing onto the dart gun when being loaded. 2015-02-15 20:27:45 -05:00
SkyMarshal
03e8acd957 Fixes errors in energy/special.dm 2015-02-15 10:45:34 -07:00
mwerezak
ad24aa8e47 Adds mercenary sniper rifle
Adds the scoped mercenary sniper rifle and ammunition defines. Does not
add syndicate uplink option.
2015-02-14 22:33:43 -05:00
mwerezak
cd81f0b706 Improves gun scope zooming 2015-02-14 22:12:16 -05:00
mwerezak
a6095a3610 Updates L6 SAW
Also changes src in user checks, probably unnecessary.
2015-02-14 22:09:19 -05:00
mwerezak
e5f8ac50b4 Rewrites grenade launchers 2015-02-14 13:39:11 -05:00
mwerezak
08635587e1 Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
mwerezak
e3be255f59 Adds dart gun projectile sprite, dart gun fixes 2015-02-14 01:33:15 -05:00
mwerezak
f8977c65af Much nicer syringe gun implementation
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00
mwerezak
0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
mwerezak
01798c98b6 Rewrites syringe and dart guns 2015-02-13 01:34:35 -05:00
mwerezak
1e9143a1f0 Reorganizes launcher source files 2015-02-12 01:38:54 -05:00
mwerezak
628bc5eecc Crossbow strings no longer magically pull back by themselves 2015-02-12 01:38:03 -05:00
mwerezak
5ab6b91c5e Generalizes emp energy weapon drain to power cells 2015-02-12 01:37:41 -05:00
mwerezak
ea39f7f718 Cleanup can_fire(), projectile flag
Removes can_fire() and moves some of it's functionality into
get_next_projectile(), which was renamed to consume_next_projectile() to
indicate the possibility of side-effects.
Also renamed flag var to check_armour
2015-02-12 01:37:19 -05:00
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