Commit Graph

7195 Commits

Author SHA1 Message Date
KorPhaeron 1609775c2c Merge pull request #15928 from AnturK/abductor_update
Minor Abductor update
2016-03-12 15:13:53 -06:00
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
AnturK 8701541d20 Fixes not being able to unbuckle from surgery tables 2016-03-12 21:44:45 +01:00
c0 8dfef3b793 fix 2016-03-12 15:07:33 +03:00
c0 9a3276c784 Alien Alloys in RnD 2016-03-12 15:07:32 +03:00
c0 f3ecb132ba Adds Alien Alloys 2016-03-12 15:06:03 +03: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 5420596dd0 Merge pull request #15819 from xxalpha/october_12th_2555
Detective can be a traitor/double agent.
2016-03-11 12:50:32 -06:00
Cheridan 713dc3ebf5 Merge pull request #15988 from Core0verload/plantrefactor3
Plant Refactor: Genesis
2016-03-11 12:37:57 -06: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
c0 6b7774a1de fixes 2016-03-11 09:52:20 +03: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
c0 240fd5bc05 Plant Refactor: Genesis 2016-03-09 09:29:37 +03:00
KorPhaeron 57493aa426 Merge pull request #15855 from kilkun/master
New Human Species Datum
2016-03-08 21:39:46 -06:00
kilkun 1bfa6cf742 Removes species from magic mirrors 2016-03-08 22:24:24 -05:00
Cheridan da1040d6f0 Merge pull request #15935 from tkdrg/wot
Attempts to fix lattices not GCing sometimes
2016-03-08 13:28:00 -06:00
Remie Richards aeaa73601c Fixes 2016-03-07 19:39:37 +00:00
Remie Richards 6268238e45 Removes my todo comments about the refactor. 2016-03-07 18:08:04 +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
Cheridan 531940cc25 Merge pull request #15932 from Impisi/Maintloot2
Fixes MaintLoot Drop Table
2016-03-06 11:15:43 -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 e6c0cd286f Attempts to fix lattices not GCing sometimes 2016-03-05 14:01:06 -03:00
Impisi 2bb60c13a3 Fixes loottable 2016-03-05 05:31:02 -08:00
Impisi 9eda2e0932 Reduces empty lootdrop slots to rebalance the table according the the original creators instructions. 2016-03-05 05:22:07 -08: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 8972a07f62 Merge pull request #15898 from KorPhaeron/rpd2
Adds RPD to Chief Engineer's locker
2016-03-04 21:35:30 -03: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 44eb9607e0 Some adjustments to wrapping code. I removed my possibility to wrap non-box storage item (that was at the expense of seeing a warning message that the packagewrap doesn't fit in the storage item every time you wrap one). So we're back to only wrapping boxes.
You can now wrap an item that is in your hand, and wrapping an item puts the created package in you hand.
Also, opening a package puts the item in your hand instead of being dropped on the ground.
2016-03-04 17:24:36 +01:00
phil235 c76f48e817 derp 2016-03-03 21:08:19 +01:00
phil235 a330cafea5 Fixes some mistakes.
Updating the package wrap's descriptions to be accurate and useful.
2016-03-03 21:02:03 +01: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
KorPhaeron 0d8c212322 RPD 2016-03-03 03:58:13 -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
KorPhaeron 6f051bbccb Span Classes 2016-03-01 20:01:12 -06:00
KorPhaeron 2bb41cd5b3 Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
2016-03-01 19:18:29 -06:00
tkdrg 74cfbabb48 Merge pull request #15837 from MMMiracles/Whetstone
increases the player skill gap
2016-03-01 21:30:48 -03:00
tkdrg a0397a73a7 Merge pull request #15698 from LanCartwright/flyvomit
Flypeople now eat vomit
2016-03-01 21:30:15 -03:00