Commit Graph

7166 Commits

Author SHA1 Message Date
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
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
tkdrg e816f3c305 Merge pull request #15834 from Impisi/MaintMRLoot
Adds Modular Receivers to the maint loot spawning table
2016-03-01 21:04:36 -03:00
Akke fc88b4d589 changes destroy() to qdel(src) 2016-03-02 00:00:54 +00: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
KorPhaeron 24e3d569f8 Door remotes 2016-03-01 01:43:12 -06: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
Impisi 1aadc83f28 I added Modular Receivers with a rarity value of 1 to the loot table for maintenance loot spawning. 2016-02-29 02:31:26 -08: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
tkdrg 9716d1f861 Merge pull request #15787 from KazeEspada/treefixes
Tree Fixes
2016-02-28 21:13:48 -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
Joan Lung 4530b586fb Merge pull request #15767 from Core0verload/pda_types_separation
PDA subtypes are moved from PDA.dm to PDA_types.dm
2016-02-27 19:17:36 -05:00
KazeEspada 81f60f84f0 fixed an edgecase where you could spam cut a tree and receive multiple logs. 2016-02-26 23:46:09 -07: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 59774fc0fb Fixes some other ghost interaction issues. 2016-02-26 23:13:13 +01: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
Cheridan 2dfebaa77e Merge pull request #15708 from KorPhaeron/sins
Five lavaland ruins
2016-02-26 08:46:32 -06:00
Cheridan d80756ce9e Merge pull request #15745 from KazeEspada/TreeCutting
Tree cutting
2016-02-26 08:40:29 -06:00
Cheridan 2d9619446f Merge pull request #15733 from phil235/ClosetAIFix
The AI's core no longer fits inside regular closets
2016-02-26 08:37:57 -06:00
c0 6e4d3c05a0 fix 2016-02-26 08:44:08 +03:00
c0 eb7cad946a PDA subtypes are moved from PDA.dm to PDA_types.dm 2016-02-26 06:08:39 +03:00