Commit Graph

13853 Commits

Author SHA1 Message Date
Remie Richards
c71de63ed5 Merge pull request #15934 from ChangelingRain/nautglow
Blobbernaut damage glow is more visible
2016-03-06 23:10:51 +00:00
Nerd Lord
9fc8fa3691 use correct flag 2016-03-06 17:59:50 -05: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
51817ef700 Merge pull request #15930 from tkdrg/runtimes
Fixes camera runtime
2016-03-06 11:16:23 -06:00
Cheridan
531940cc25 Merge pull request #15932 from Impisi/Maintloot2
Fixes MaintLoot Drop Table
2016-03-06 11:15:43 -06:00
Nerd Lord
218d456e5a naut 'damage' glow is more visible on all blob types 2016-03-05 10:59:53 -05: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
9633cae728 Fixes camera runtime 2016-03-05 08:51:48 -03:00
tkdrg
442c769eeb Merge pull request #15888 from ChangelingRain/robustin-can-never-be-satisfied
Robustin-Sponsored Blobbernaut Nerf PR
2016-03-05 08:12:29 -03:00
tkdrg
96d8652ec4 Merge pull request #15885 from phil235/ReagentMobUpdateFix2
Health update from reagent metabolization now only happens once. Part 2
2016-03-04 22:18:39 -03: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
Menshin
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
tkdrg
3585fd3e9c Merge pull request #15889 from phil235/BolaNogravThrowFix
Fixes throwing bola and embeddable items in no gravity
2016-03-04 21:33:56 -03:00
Cheridan
a7eb9f657e Merge pull request #15905 from KorPhaeron/chaplain
Holy Weapon typo fix
2016-03-04 18:08:58 -06:00
Nerd Lord
d63dbdcb96 I guess they can be fast if it's 1 per 2016-03-04 17:07:31 -05:00
Joan Lung
6a79d12862 Merge pull request #15884 from RemieRichards/XenoBreathNoises
Aliens now make breathing noises
2016-03-04 12:22:45 -05: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
Cheridan
1ae539e2d1 Merge pull request #15908 from Core0verload/plantrefactor1
Plant Refactor: It came from the Conflicts Hell
2016-03-04 01:02:50 -06:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
AnturK
ae9e56d21f Merge pull request #15852 from KazeEspada/Cabin
Cabin Away Mission
2016-03-03 22:18:12 +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
phil235
c7b7230827 Change some for loop with grabbed_by to be typeless since grabbed_by only contains grabs.
Replace super weird "locate(/obj/item/weapon/grab, locate(/obj/item/weapon/grab, mob.grabbed_by.len))" by simple if(grabbed_by.len)"
Cleans up Process_Grab to be easier to read.
Simplifies MobBump() proc, especially the part about pushing a mob that is pulling or is pullsed/grabbed. We no longer check for mobs in a 1 tile radius every time we bump a mob.
Fixes runtime with clear_reagents_to_vomit_pool() due to a typo.
2016-03-03 14:20:42 +01: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
TehZombehz
b4c165655d My first attempt at a commit. Adds a green version of the plaid skirt to the clothesmate. It's just a recolor. 2016-03-02 23:42:58 -06:00
tkdrg
35cf237233 Merge pull request #15875 from PKPenguin321/patch-9
fixes typo with bolas
2016-03-02 22:59:03 -03:00
Nerd Lord
f869a2c9f3 Blobbernauts are now one-per-factory, reduce the factory's maxhealth by 75% while alive, and die slowly if they have no factory 2016-03-02 17:53:30 -05:00
phil235
9d702bd72e Fixes throwing bola and embeddable items in no gravity, the thrown objects no longer bounces back if it's been inserted inside what it hit. 2016-03-02 23:39:56 +01:00
Nerd Lord
af844e6faa Slows down blobbernauts
Blobbernauts now attack and move much slower.
2016-03-02 16:37:14 -05:00
AnturK
eda3426633 Merge pull request #15839 from ChangelingRain/blobberguards
Blobbernauts now die slowly when not near the blob
2016-03-02 22:13:37 +01:00
phil235
c07a48a84d Moved changeling adrenaline and shadowling blindness smoke reagent to the proper reagent files.
Fixes these two reagents calling mob update procs when they shouldn't.
2016-03-02 19:55:55 +01:00
Remie Richards
6ff3292569 Xeno breathing sounds now play in maint, Is it steam in the pipes? OR IMPENDING DOOM!? 2016-03-02 18:39:03 +00:00
Cheridan
ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo
Remake of #15690. Replaces newcult with oldcult.
2016-03-01 22:37:58 -06: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
799e923eff Merge pull request #15840 from phil235/RobotAttackSelfFix
Cyborgs can no longer activate the object in their active module when incapacitated
2016-03-01 21:14:55 -03:00
tkdrg
9211b19b38 Merge pull request #15836 from phil235/SpellFix
Fixes spell action button not being updated correctly
2016-03-01 21:09:20 -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