Commit Graph

102 Commits

Author SHA1 Message Date
PKPenguin321
14f272c082 reduces cost of throwing weapons box (#21649) 2016-11-20 20:41:32 -06:00
oranges
fed780fa9b Merge pull request #21540 from Supermichael777/revert-21014-atmosgrenades
Revert "Atmos Grenades"
2016-11-15 16:40:35 +13:00
uraniummeltdown
3bd538a1b3 Adds raw TC to uplink and 10mm ammo variants (#21498)
* adds raw telecrystals to uplink, can be used to refill uplinks and uplink implants, adds 10mm variants to uplink for traitors and nuke ops

* grammar
2016-11-14 19:02:40 +13:00
Supermichael777
5d9bc48034 Revert "Atmos Grenades" 2016-11-13 19:44:29 -05:00
Militaires
889c82a247 CQC tweaks, improvements and fixes [and adds and utilizes martial art blocks) (#21201)
fixes an abusive exploit and makes 2 combos easier to use, increases cqc harm damage, adds martial art block_chance var which is only activated if you have your throw_mode on for active defense.

baton blocks stun the person attempting the attack too, you can now block batons and then throw or chokehold.

makes tc cost for CQC 13 with all the buffs.
2016-11-07 09:01:41 +13:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
kevinz000
7e364fd79a rip 2016-10-29 20:45:23 -07:00
kevinz000
bbeaffe9c5 Hardlight Bows (#20944)
Adds hardlight bows and hardlight quivers.
Does 12 brute and 18 burn on hit.
The quivers regenerate one arrow every few seconds and is worn on the back.
Arrows disintegrate on hit and are destroyed after 20 seconds if it is dropped to prevent spam.

ADDED TO UPLINK AT 7 TELECRYSTALS FOR A BOW AND QUIVER. Can be included in surplus crates.
🆑
2016-10-28 14:16:16 +13:00
uraniummeltdown
1635017bb2 Atmos Grenades (#21014)
* adds atmos grenades to game and uplink

* added freon grenade, price is now 12 TC, made var for contents

* price is now 11 TC

* fixes knockout desc
2016-10-24 00:15:51 +13:00
Militaires
2431e709b8 CQC PR AGAIN and does what orangus wanted. (#20932)
A third martial art, CQC, has been added and is now available to nuke ops instead of sleeping carp

added leg sweeps by resting and then harming someone, so that you can flank someone by pretending to be crit or ded henk, not putting it in the recall teachings cause im a memer like that

new: CUSTOM CQC SOUNDS
2016-10-18 09:11:02 +13:00
Incoming
2617dabb99 Intensifies the secret satchel system so people will actually use it. 2016-09-25 21:28:56 -04:00
Shadowlight213
5d98fb64d9 changes to instead use the argument in get_uplink_items 2016-09-07 21:49:54 -07:00
Shadowlight213
cacc091ed3 Makes the surplus crate only give items in the current mode's uplink list
Removes sleeping carp scroll from surplus crate
2016-09-07 21:45:14 -07:00
pubby
109ad42a51 Tweak military belt TC cost from 3 -> 1 2016-09-02 18:16:28 -05:00
Shadowlight213
751bd54518 Reworks the uplink interface to drastically reduce loading lag. (#19841) 2016-08-13 22:34:16 +02:00
Fox-McCloud
bba7fab257 additions 2016-07-31 09:57:11 -04:00
Fox-McCloud
146d14a26e Refactor Uplink Refunding 2016-07-24 09:21:37 -04:00
Shadowlight213
5f10739385 Repaths satchels and lets angels equip them (#19371)
Repaths satchels so all the different ones are children of the normal satchel.
Allows angels to equip satchels since the satchels are on the side of the body instead of the back. Should help miners who find the potion out a bit.
2016-07-22 10:10:30 +12:00
MMMiracles
706a4f344b Adds the Power Fist (#19013)
The power-fist is a semi-port of hippiestation's power-fist. Sprites are from hippiestation.

The power fist is a metallic gauntlet with a built-in piston-ram that uses an external tank as its gas source. A wrench can be used to dial up the piston's valve and make the gauntlet hit harder and farther in exchange for more gas used.

A full large-tank will get exactly 4 level-3 punches in before needing to replace the external tank. This thing is incredibly lethal for taking out singular targets at a time but very poor against crowds as odds are you're going to exhaust your supply before fending off everyone.

The TC price might be too low/high, I don't know yet until people play around with it in an actual round. All I know is punching pun-pun half-way down the escape hall in a single hit is fun.
2016-07-02 14:40:22 +12:00
Razharas
f508e0fd29 Merge pull request #18976 from KorPhaeron/durkel
Removes stands from uplink
2016-06-30 03:53:36 +03:00
KorPhaeron
761a607990 removes stands 2016-06-27 21:06:10 -04:00
oranges
41e3acc71d Merge pull request #18820 from Xhuis/the_pinnacle_of_deception_technology
Adds cardboard cutouts
2016-06-24 20:14:59 +12:00
Xhuis
369ad867de Adds cardboard cutouts 2016-06-21 17:57:53 -04:00
Joan Lung
a9d4aa50c4 Nuke ops can no longer get free noslips with their camo kit 2016-06-19 11:41:42 -04:00
Core0verload
bb43219915 Rebalances radioactive microlaser (#18537)
This PR is aimed at making radioactive microlaser less useless.

Radioactive microlaser is now a subtype of health analyzer. Using it on someone would print out target's health status. Useful for stealth. You can disable this in microlaser's menu.

You can disable microlaser's irradiation in the same menu. Just in case you want to check your own health without carrying a real health analyzer.

Radioactive microlaser has it's max rad output increased 200%.

Radioactive microlaser cooldown is cut in two.
2016-06-17 09:11:52 +12:00
Thunder12345
a9a97f5a81 Fixes for Merge Tokens (#18168)
* fixes #15649
fixes #16575

* oops forgot those lines
2016-06-03 14:46:42 -05:00
Jack Edge
462aa7782a KA rebalance; brings back holding a satchel
Fixes #17203.

🆑 coiax
rscadd: Kinetic accelerators only require one hand to be fired, as before
rscdel: Kinetic accelerators recharge time is multiplied by the number of KAs that person is carrying.
rscdel: Kinetic accelerators lose their charge quickly if not equipped or being held
rscadd: Kinetic accelerator modkits (made at R&D or your local Free Golem
ship) overcome these flaws
/🆑

Effects on people who just use one kinetic accelerator: *They can now
carry a mining satchel in the off hand again.*
Effects on people who want to dual wield them both at once: They can do
this, but they recharge twice as slow, so no increase in DPS.
Effects on people who quasi-dual wielded by swapping them in and out of
the backpack: Now treated the same as dual wielders.

And as before, modkits mean you can properly dual wield KAs.
Mining cyborgs are unaffected.
2016-05-17 00:38:29 +01:00
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Jordie
f3f0c63e4f Merge pull request #17245 from nullbear/c4-path
Changes C4 Path and adds X4 breaching charge
2016-05-01 16:41:07 +10:00
nullbear
5cd0cca621 Adds more reuseable c4 type path. Adds x4. Fixes chembomb recipe. 2016-04-29 03:31:17 -07:00
bawhoppen
02beeeda6d reeeeeeee 2016-04-27 03:02:00 -05:00
Lularian
54c825416d changes some TC prices 2016-04-22 08:25:08 -05:00
Leo
f677ae78bb Crate being 30 player minimum is stupid 2016-04-14 13:47:40 -03:00
KorPhaeron
71f0766215 Restricts the surplus crate as well 2016-04-11 08:50:00 -05:00
KorPhaeron
5d6a2c113f Low Population Restriction 2016-04-11 08:44:59 -05:00
KorPhaeron
4d0cc1e0f0 Cannon 2016-04-06 11:37:32 -05:00
AnturK
b6b8a3eb09 Merge pull request #16260 from Bawhoppen/grenadesholyshithelp
Grenade belt for nukeops
2016-03-22 19:35:43 +01:00
AnturK
2a327b1b7b Merge pull request #16188 from Robustin/zap
Singularity beacon now attracts the Tesla Ball
2016-03-22 19:18:45 +01:00
Robustin
f8a59bb002 Update uplink_item.dm 2016-03-21 10:52:26 -04:00
bawhoppen
07ca0c9515 compromising is hard 2016-03-20 20:57:50 -05:00
bawhoppen
d410b37e2d more comrpomise 2016-03-20 20:12:36 -05:00
bawhoppen
f71de178c0 compromised 2016-03-20 20:10:22 -05:00
Lularian
83624574e5 tkdrg said to name commits something useful 2016-03-20 19:50:22 -05:00
Nerd Lord
e7a395a980 Space suits are much less likely to appear in the syndicate crate
Nukeops can once again buy noslips(god)
2016-03-18 18:01:00 -04:00
Akke
18897ac972 resderved 2016-03-14 23:24:28 +00:00
Joan Lung
e469a4d35e Merge pull request #16018 from PKPenguin321/tactical-bola
Bolas update: Traitor items edition
2016-03-11 21:01:24 -05:00
PKPenguin321
3be53bb7a4 changes var for bola stunning
now instead of a TRUE/FALSE toggle, it's the actual amount of Weaken() applied. default is 0 (no stun)
also fixes small typo in uplink_item.dm
2016-03-10 19:33:54 -08:00
PKPenguin321
08f78d7db9 adds reinforced bolas, tweaks uplink throwing star bundle
adds reinforced bolas, they do a Weaken(1) and take twice as long to break out of when compared to normal ones. their sprite has a different color
moves throwing star bundle to uplink_kits.dm from weaponry.dm and makes it use a syndicate box
tweaked the throwing star bundle to be the throwing weapon bundle, updated uplink listing and description accordingly
lowered throwing weapon bundle cost to 5 from 6
2016-03-09 23:02:18 -08:00
Akke
d9bca07308 @steelpoint you didn't remove the bundles. 2016-03-09 23:18:53 +00:00