Commit Graph

2968 Commits

Author SHA1 Message Date
duncathan salt e0d3ac1d28 Merge pull request #16050 from Dorsisdwarf/AIlaws
Adds a series of new laws and boards
2016-03-12 15:12:42 -06: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
Dorsisdwarf eec22d0ca4 Adds a series of new laws and boards 2016-03-11 19:58:59 +00:00
KorPhaeron fdd368b8bd Merge pull request #15997 from LanCartwright/m90glproperlyremoved
Do it right first time edition 2. M90GL edition.
2016-03-11 04:22:24 -06: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
Cheridan e43b3a891d Merge pull request #15964 from RemieRichards/buckle_many_mobs
Many Buckled Mobs
2016-03-10 08:22:27 -06: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
Cheridan 3449768b59 Merge pull request #15939 from erwgd/PlasmamanTankImprovements
Plasmaman tank improvements
2016-03-09 22:13:58 -06:00
Akke d9bca07308 @steelpoint you didn't remove the bundles. 2016-03-09 23:18:53 +00:00
Remie Richards aeaa73601c Fixes 2016-03-07 19:39:37 +00:00
Remie Richards 4e821d8657 Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality 2016-03-07 18:03:25 +00:00
Cheridan f68584078c Merge pull request #15916 from Menshin/gc_destroyed2qdeleted
Replaced last occurences of gc_destroyed by qdeleted()
2016-03-06 12:29:30 -06:00
erwgd 8a14a6efb1 changed plasmaman plasma tank name to somewhat redundant 'plasmaman plasma tank' 2016-03-05 22:11:48 +00:00
erwgd 976a4c5548 change plasmaman tank name to just 'plasma tank', removed plasmaman belt tank description 2016-03-05 18:17:34 +00:00
erwgd 57b0164f82 added descriptions for plasmaman tanks, made their default distribution pressure same as in oxygen internals tanks 2016-03-05 17:42:39 +00:00
tkdrg 2389fd0b01 Merge pull request #15899 from phil235/ResistandGrabFixes
Fixes being able to resist while dead.
2016-03-04 22:14:35 -03:00
KiwiFarms 9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
tkdrg e0b4569165 Merge pull request #15895 from TehZombehz/firstfashion
Adds green version of the plaid skirt.
2016-03-04 21:34:42 -03:00
phil235 15d8e0a96f I refactored how a mob resisting out of a closet that is itself inside something is done.
Fixes not being able to resist out of an unlocked unwelded locker. Now both moving and the resist button  work (except for the cardboard box).
You can no longer spam breakingout message ouf of a closet by moving while inside.
Wrapping and unwrapping a locker no longer unwelds it magically.
I refactored closet/crate/item package wrapping.
You can packagewrap belts and other storage items in which the package wrap item doesn't fit.(it does currently have the unintended side effect of giving you the "doesn't fit in X" message when wrapping there storage items though).
2016-03-03 20:20:34 +01:00
KorPhaeron 555d55f39a Typo fix 2016-03-03 12:41:07 -06:00
TehZombehz 943c3e45e0 Comments number updated. 2016-03-03 05:04:04 -06:00
TehZombehz 78ac55d8fb Increases size of clothesmate refill accordingly. 2016-03-03 00:19:23 -06:00
Cheridan 2a6d069b5b Merge pull request #15867 from RemieRichards/monkey_jetpack_fix
Fixes Monkeys not being able to steer jetpacks.
2016-03-03 00:13:00 -06:00
tkdrg 35cf237233 Merge pull request #15875 from PKPenguin321/patch-9
fixes typo with bolas
2016-03-02 22:59:03 -03:00
tkdrg 74cfbabb48 Merge pull request #15837 from MMMiracles/Whetstone
increases the player skill gap
2016-03-01 21:30:48 -03:00
PKPenguin321 42e82b0746 fixes typo with bolas
byond editor has no spellcheck
2016-03-01 15:39:46 -08:00
tkdrg 41a42922d2 Merge pull request #15709 from Malkevin/cuffsandclean
Cuffs and sec clean up
2016-03-01 20:28:56 -03:00
Remie Richards 28a49d127d Fixes Monkeys not being able to steer jetpacks. 2016-03-01 18:00:00 +00:00
MMMiracles 454928f3cd increases the player skill gap
if you don't know what a whetstone is then maybe you should just git gud
2016-02-29 11:43:21 -05:00
Jordie 897aecadf5 Merge pull request #15780 from PKPenguin321/bolas
Adds bolas
2016-02-29 15:01:42 +11:00
Jordie 32bf31f3a0 Merge pull request #15707 from Core0verload/breathing_implant
[Ready] New cyberimplant: breathing tube
2016-02-29 14:53:42 +11:00
tkdrg bc5c023883 Merge pull request #15809 from bgobandit/bettercontraband
Makes contraband crates great again.
2016-02-28 23:13:55 -03:00
bgobandit 5127ba71fc reverts name change, tweaks cost 2016-02-28 11:01:30 -05:00
bgobandit 6b5379f053 Adds items to contraband crate. 2016-02-27 20:14:16 -05:00
tkdrg 77b7f02bdd Merge pull request #15775 from AnturK/fix1
Bunch of fixes
2016-02-27 21:27:08 -03:00
PKPenguin321 2932b14256 fixes grammar/nullspace error 2016-02-26 19:59:45 -08:00
PKPenguin321 d9a214e931 adds bolas
adds the item itself and a hand-crafting method to handcuffs.dm
adds a tablecrafting recipe to recipes.dm
adds the sprite to items.dmi
2016-02-26 17:59:55 -08:00
AnturK c3fd11dc54 Adds cancel button to teleporation scroll 2016-02-26 22:33:12 +01:00
Cheridan ca462c0dbc Merge pull request #15742 from PKPenguin321/emp-kit-buff
Buffs the EMP kit
2016-02-26 09:20:39 -06:00
Cheridan 9e5392b94b Merge pull request #15753 from Menshin/rpd_invisipipe_fix
Makes RPD starts on pipe building mode
2016-02-26 08:52:06 -06:00
Joan Lung 86c72e845b Merge pull request #15741 from PKPenguin321/patch-18
sharpening blocks hotfix
2016-02-25 20:08:45 -05:00
KiwiFarms 8c41e37d3e * RPD now starts in pipe building mode
* Removed unused var
2016-02-25 13:51:11 +01:00
c0 6c9be9c82d Adds breathing tube implant, changes how heart works, reworks arm-mounted implants 2016-02-25 12:50:45 +03:00
PKPenguin321 28795e2a28 buffs emp kit
implant has 3 uses up from 2
5 EMP grenades up from 2
2016-02-24 20:38:10 -08:00
Joan Lung 80c9101892 Merge pull request #15661 from AndrewJacksonThe2nd/PARANOIA
A TEAM OF NUKEOPS DISGUISED AS THE HEADS OF STAFF
2016-02-24 23:25:17 -05:00
PKPenguin321 04b4955c2e better fix for sharpness override part
thanks kaze
2016-02-24 18:20:46 -08:00
PKPenguin321 cf29fdd8e1 sharpening blocks hotfix
makes things that are IS_SHARP_ACCURATE sharpenable, as well as things that are just IS_SHARP
makes sharpness not change unless it's a super-sharpening block
2016-02-24 18:15:13 -08:00
Cheridan 26731ee94e Merge pull request #15519 from PKPenguin321/sharpened-bikehorn
Adds sharpening blocks
2016-02-24 19:49:40 -06:00
Razharas e9a347289b Merge pull request #15681 from PKPenguin321/patch-13
Tweaks stun/teleprod tablecrafting recipes
2016-02-24 14:47:31 +03:00
AndrewJacksonThe2nd 38f3f1dada Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00